---

yaml
---
r: 56989
b: refs/heads/master
c: fd184ab
h: refs/heads/master
i:
  56987: bc1a75a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ff75ed254bdbb47bb0c1d71a3cc65f6831a8e3a
+refs/heads/master: fd184ab4283a6a6105e8312a497d2a2a193eaf67

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/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

trunk/Documentation/i386/boot.txt

@@ -2,7 +2,7 @@
 		     ----------------------------
 
 		    H. Peter Anvin <hpa@zytor.com>
-			Last update 2007-05-23
+			Last update 2007-05-16
 
 On the i386 platform, the Linux kernel uses a rather complicated boot
 convention.  This has evolved partially due to historical aspects, as
@@ -202,8 +202,6 @@ All general purpose boot loaders should write the fields marked
 nonstandard address should fill in the fields marked (reloc); other
 boot loaders can ignore those fields.
 
-The byte order of all fields is littleendian (this is x86, after all.)
-
 Field name:	setup_secs
 Type:		read
 Offset/size:	0x1f1/1
@@ -282,16 +280,14 @@ Type:		read
 Offset/size:	0x206/2
 Protocol:	2.00+
 
-  Contains the boot protocol version, in (major << 8)+minor format,
-  e.g. 0x0204 for version 2.04, and 0x0a11 for a hypothetical version
-  10.17.
+  Contains the boot protocol version, e.g. 0x0204 for version 2.04.
 
 Field name:	readmode_swtch
 Type:		modify (optional)
 Offset/size:	0x208/4
 Protocol:	2.00+
 
-  Boot loader hook (see ADVANCED BOOT LOADER HOOKS below.)
+  Boot loader hook (see separate chapter.)
 
 Field name:	start_sys
 Type:		read
@@ -308,17 +304,10 @@ Protocol:	2.00+
   If set to a nonzero value, contains a pointer to a NUL-terminated
   human-readable kernel version number string, less 0x200.  This can
   be used to display the kernel version to the user.  This value
-  should be less than (0x200*setup_sects).
-
-  For example, if this value is set to 0x1c00, the kernel version
-  number string can be found at offset 0x1e00 in the kernel file.
-  This is a valid value if and only if the "setup_sects" field
-  contains the value 15 or higher, as:
-
-	0x1c00  < 15*0x200 (= 0x1e00) but
-	0x1c00 >= 14*0x200 (= 0x1c00)
-
-	0x1c00 >> 9 = 14, so the minimum value for setup_secs is 15.
+  should be less than (0x200*setup_sects).  For example, if this value
+  is set to 0x1c00, the kernel version number string can be found at
+  offset 0x1e00 in the kernel file.  This is a valid value if and only
+  if the "setup_sects" field contains the value 14 or higher.
 
 Field name:	type_of_loader
 Type:		write (obligatory)
@@ -388,7 +377,7 @@ Protocol:	2.00+
 
   This field can be modified for two purposes:
 
-  1. as a boot loader hook (see ADVANCED BOOT LOADER HOOKS below.)
+  1. as a boot loader hook (see separate chapter.)
 
   2. if a bootloader which does not install a hook loads a
      relocatable kernel at a nonstandard address it will have to modify
@@ -726,7 +715,7 @@ switched off, especially if the loaded kernel has the floppy driver as
 a demand-loaded module!
 
 
-**** ADVANCED BOOT LOADER HOOKS
+**** ADVANCED BOOT TIME HOOKS
 
 If the boot loader runs in a particularly hostile environment (such as
 LOADLIN, which runs under DOS) it may be impossible to follow the
@@ -751,5 +740,4 @@ IMPORTANT: All the hooks are required to preserve %esp, %ebp, %esi and
 	set them up to BOOT_DS (0x18) yourself.
 
 	After completing your hook, you should jump to the address
-	that was in this field before your boot loader overwrote it
-	(relocated, if appropriate.)
+	that was in this field before your boot loader overwrote it.