---

yaml
---
r: 57010
b: refs/heads/master
c: 02d89b8
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a41d7f000447015f3f5fe7223f1d53845268e2e8
+refs/heads/master: 02d89b87081f516ad3993637f9b75db0d9786554

trunk/Documentation/CodingStyle

@@ -495,40 +495,29 @@ re-formatting you may want to take a look at the man page.  But
 remember: "indent" is not a fix for bad programming.
 
 
-		Chapter 10: Kconfig configuration files
+		Chapter 10: Configuration-files
 
-For all of the Kconfig* configuration files throughout the source tree,
-the indentation is somewhat different.  Lines under a "config" definition
-are indented with one tab, while help text is indented an additional two
-spaces.  Example:
+For configuration options (arch/xxx/Kconfig, and all the Kconfig files),
+somewhat different indentation is used.
 
-config AUDIT
-	bool "Auditing support"
-	depends on NET
-	help
-	  Enable auditing infrastructure that can be used with another
-	  kernel subsystem, such as SELinux (which requires this for
-	  logging of avc messages output).  Does not do system-call
-	  auditing without CONFIG_AUDITSYSCALL.
-
-Features that might still be considered unstable should be defined as
-dependent on "EXPERIMENTAL":
-
-config SLUB
-	depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT
-	bool "SLUB (Unqueued Allocator)"
-	...
+Help text is indented with 2 spaces.
 
-while seriously dangerous features (such as write support for certain
-filesystems) should advertise this prominently in their prompt string:
-
-config ADFS_FS_RW
-	bool "ADFS write support (DANGEROUS)"
-	depends on ADFS_FS
-	...
+if CONFIG_EXPERIMENTAL
+	tristate CONFIG_BOOM
+	default n
+	help
+	  Apply nitroglycerine inside the keyboard (DANGEROUS)
+	bool CONFIG_CHEER
+	depends on CONFIG_BOOM
+	default y
+	help
+	  Output nice messages when you explode
+endif
 
-For full documentation on the configuration files, see the file
-Documentation/kbuild/kconfig-language.txt.
+Generally, CONFIG_EXPERIMENTAL should surround all options not considered
+stable. All options that are known to trash data (experimental write-
+support for file-systems, for instance) should be denoted (DANGEROUS), other
+experimental options should be denoted (EXPERIMENTAL).
 
 
 		Chapter 11: Data structures

trunk/Documentation/DocBook/gadget.tmpl

@@ -52,7 +52,7 @@
 
 <toc></toc>
 
-<chapter id="intro"><title>Introduction</title>
+<chapter><title>Introduction</title>
 
 <para>This document presents a Linux-USB "Gadget"
 kernel mode

trunk/Documentation/DocBook/usb.tmpl

@@ -185,7 +185,7 @@
 
     </chapter>
 
-<chapter id="types"><title>USB-Standard Types</title>
+<chapter><title>USB-Standard Types</title>
 
     <para>In <filename>&lt;linux/usb/ch9.h&gt;</filename> you will find
     the USB data types defined in chapter 9 of the USB specification.
@@ -197,7 +197,7 @@
 
     </chapter>
 
-<chapter id="hostside"><title>Host-Side Data Types and Macros</title>
+<chapter><title>Host-Side Data Types and Macros</title>
 
     <para>The host side API exposes several layers to drivers, some of
     which are more necessary than others.
@@ -211,7 +211,7 @@
 
     </chapter>
 
-    <chapter id="usbcore"><title>USB Core APIs</title>
+    <chapter><title>USB Core APIs</title>
 
     <para>There are two basic I/O models in the USB API.
     The most elemental one is asynchronous:  drivers submit requests
@@ -248,7 +248,7 @@
 !Edrivers/usb/core/hub.c
     </chapter>
 
-    <chapter id="hcd"><title>Host Controller APIs</title>
+    <chapter><title>Host Controller APIs</title>
 
     <para>These APIs are only for use by host controller drivers,
     most of which implement standard register interfaces such as
@@ -285,7 +285,7 @@
 !Idrivers/usb/core/buffer.c
     </chapter>
 
-    <chapter id="usbfs">
+    <chapter>
 	<title>The USB Filesystem (usbfs)</title>
 
 	<para>This chapter presents the Linux <emphasis>usbfs</emphasis>.
@@ -317,7 +317,7 @@
 	not it has a kernel driver.
 	</para>
 
-	<sect1 id="usbfs-files">
+	<sect1>
 	    <title>What files are in "usbfs"?</title>
 
 	    <para>Conventionally mounted at
@@ -356,7 +356,7 @@
 
 	</sect1>
 
-	<sect1 id="usbfs-fstab">
+	<sect1>
 	    <title>Mounting and Access Control</title>
 
 	    <para>There are a number of mount options for usbfs, which will
@@ -439,7 +439,7 @@
 
 	</sect1>
 
-	<sect1 id="usbfs-devices">
+	<sect1>
 	    <title>/proc/bus/usb/devices</title>
 
 	    <para>This file is handy for status viewing tools in user
@@ -473,7 +473,7 @@ for (;;) {
 	    </para>
 	</sect1>
 
-	<sect1 id="usbfs-bbbddd">
+	<sect1>
 	    <title>/proc/bus/usb/BBB/DDD</title>
 
 	    <para>Use these files in one of these basic ways:
@@ -510,7 +510,7 @@ for (;;) {
 	    </sect1>
 
 
-	<sect1 id="usbfs-lifecycle">
+	<sect1>
 	    <title>Life Cycle of User Mode Drivers</title>
 
 	    <para>Such a driver first needs to find a device file
@@ -565,7 +565,7 @@ for (;;) {
 
 	    </sect1>
 
-	<sect1 id="usbfs-ioctl"><title>The ioctl() Requests</title>
+	<sect1><title>The ioctl() Requests</title>
 
 	    <para>To use these ioctls, you need to include the following
 	    headers in your userspace program:
@@ -604,7 +604,7 @@ for (;;) {
 	    </para>
 
 
-	    <sect2 id="usbfs-mgmt">
+	    <sect2>
 		<title>Management/Status Requests</title>
 
 		<para>A number of usbfs requests don't deal very directly
@@ -736,7 +736,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param)
 
 		</sect2>
 
-	    <sect2 id="usbfs-sync">
+	    <sect2>
 		<title>Synchronous I/O Support</title>
 
 		<para>Synchronous requests involve the kernel blocking
@@ -865,7 +865,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param)
 		</variablelist>
 	    </sect2>
 
-	    <sect2 id="usbfs-async">
+	    <sect2>
 		<title>Asynchronous I/O Support</title>
 
 		<para>As mentioned above, there are situations where it may be

trunk/Documentation/HOWTO

@@ -396,6 +396,26 @@ bugme-janitor mailing list (every change in the bugzilla is mailed here)
 
 
 
+Managing bug reports
+--------------------
+
+One of the best ways to put into practice your hacking skills is by fixing
+bugs reported by other people. Not only you will help to make the kernel
+more stable, you'll learn to fix real world problems and you will improve
+your skills, and other developers will be aware of your presence. Fixing
+bugs is one of the best ways to get merits among other developers, because
+not many people like wasting time fixing other people's bugs.
+
+To work in the already reported bug reports, go to http://bugzilla.kernel.org.
+If you want to be advised of the future bug reports, you can subscribe to the
+bugme-new mailing list (only new bug reports are mailed here) or to the
+bugme-janitor mailing list (every change in the bugzilla is mailed here)
+
+	http://lists.osdl.org/mailman/listinfo/bugme-new
+	http://lists.osdl.org/mailman/listinfo/bugme-janitors
+
+
+
 Mailing lists
 -------------
 

trunk/Documentation/dontdiff

@@ -10,12 +10,10 @@
 *.grp
 *.gz
 *.html
-*.i
 *.jpeg
 *.ko
 *.log
 *.lst
-*.moc
 *.mod.c
 *.o
 *.orig
@@ -27,23 +25,16 @@
 *.s
 *.sgml
 *.so
-*.symtypes
-*.tab.c
-*.tab.h
 *.tex
 *.ver
 *.xml
 *_MODULES
 *_vga16.c
 *cscope*
 *~
-*.9
-*.9.gz
 .*
 .cscope
 53c700_d.h
-53c7xx_d.h
-53c7xx_u.h
 53c8xx_d.h*
 BitKeeper
 COPYING
@@ -79,11 +70,9 @@ bzImage*
 classlist.h*
 comp*.log
 compile.h*
-conf
 config
 config-*
 config_data.h*
-config_data.gz*
 conmakehash
 consolemap_deftbl.c*
 crc32table.h*
@@ -92,95 +81,66 @@ defkeymap.c*
 devlist.h*
 docproc
 dummy_sym.c*
-elf2ecoff
 elfconfig.h*
 filelist
 fixdep
 fore200e_mkfirm
 fore200e_pca_fw.c*
-gconf
 gen-devlist
 gen-kdb_cmds.c*
 gen_crc32table
 gen_init_cpio
 genksyms
 gentbl
-*_gray256.c
 ikconfig.h*
-initramfs_data.cpio
-initramfs_data.cpio.gz
 initramfs_list
 kallsyms
 kconfig
 kconfig.tk
 keywords.c*
 ksym.c*
 ksym.h*
-kxgettext
-lkc_defs.h
 lex.c*
-lex.*.c
-lk201-map.c
 logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
 mach-types
 mach-types.h
-machtypes.h
 make_times_h
 map
 maui_boot.h
-mconf
-miboot*
 mk_elfconfig
-mkboot
-mkbugboot
 mkdep
-mkprep
 mktables
-mktree
 modpost
 modversions.h*
 offset.h
 offsets.h
 oui.c*
 parse.c*
 parse.h*
-patches*
-pca200e.bin
-pca200e_ecd.bin2
-piggy.gz
-piggyback
 pnmtologo
 ppc_defs.h*
 promcon_tbl.c*
 pss_boot.h
-qconf
 raid6altivec*.c
 raid6int*.c
 raid6tables.c
-relocs
-series
 setup
 sim710_d.h*
-sImage
 sm_tbl*
 split-include
 tags
-tftpboot.img
 times.h*
 tkparse
 trix_boot.h
 utsrelease.h*
 version.h*
 vmlinux
 vmlinux-*
-vmlinux.aout
 vmlinux.lds
 vsyscall.lds
 wanxlfw.inc
 uImage
-unifdef
-zImage*
-zconf.hash.c
+zImage