---

yaml
---
r: 45727
b: refs/heads/master
c: 54b290a
h: refs/heads/master
i:
  45725: 449aa77
  45723: 717dacc
  45719: 1985782
  45711: 16e0982
  45695: c91787f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95543179f158b4891c5dc49004853ce081e8d794
+refs/heads/master: 54b290a2ecfbfb8613fbf854f9c45667821d9b8d

trunk/Documentation/SubmitChecklist

@@ -72,7 +72,3 @@ kernel patches.
 
     If the new code is substantial, addition of subsystem-specific fault
     injection might be appropriate.
-
-22: Newly-added code has been compiled with `gcc -W'.  This will generate
-    lots of noise, but is good for finding bugs like "warning: comparison
-    between signed and unsigned".

trunk/Documentation/feature-removal-schedule.txt

@@ -318,3 +318,10 @@ Why:	/proc/acpi/button has been replaced by events to the input layer
 Who:	Len Brown <len.brown@intel.com>
 
 ---------------------------
+
+What:	JFFS (version 1)
+When:	2.6.21
+Why:	Unmaintained for years, superceded by JFFS2 for years.
+Who:	Jeff Garzik <jeff@garzik.org>
+
+---------------------------

trunk/Documentation/kdump/kdump.txt

@@ -17,7 +17,7 @@ You can use common Linux commands, such as cp and scp, to copy the
 memory image to a dump file on the local disk, or across the network to
 a remote system.
 
-Kdump and kexec are currently supported on the x86, x86_64, ppc64 and ia64
+Kdump and kexec are currently supported on the x86, x86_64, ppc64 and IA64
 architectures.
 
 When the system kernel boots, it reserves a small section of memory for
@@ -61,12 +61,7 @@ Install kexec-tools
 
 2) Download the kexec-tools user-space package from the following URL:
 
-http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-testing.tar.gz
-
-This is a symlink to the latest version, which at the time of writing is
-20061214, the only release of kexec-tools-testing so far. As other versions
-are made released, the older onese will remain available at
-http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
+http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-testing-20061214.tar.gz
 
 Note: Latest kexec-tools-testing git tree is available at
 
@@ -76,11 +71,11 @@ http://www.kernel.org/git/?p=linux/kernel/git/horms/kexec-tools-testing.git;a=su
 
 3) Unpack the tarball with the tar command, as follows:
 
-   tar xvpzf kexec-tools-testing.tar.gz
+   tar xvpzf kexec-tools-testing-20061214.tar.gz
 
-4) Change to the kexec-tools directory, as follows:
+4) Change to the kexec-tools-1.101 directory, as follows:
 
-   cd kexec-tools-testing-VERSION
+   cd kexec-tools-testing-20061214
 
 5) Configure the package, as follows:
 
@@ -229,23 +224,7 @@ Dump-capture kernel config options (Arch Dependent, ppc64)
 
 Dump-capture kernel config options (Arch Dependent, ia64)
 ----------------------------------------------------------
-
-- No specific options are required to create a dump-capture kernel
-  for ia64, other than those specified in the arch idependent section
-  above. This means that it is possible to use the system kernel
-  as a dump-capture kernel if desired.
-
-  The crashkernel region can be automatically placed by the system
-  kernel at run time. This is done by specifying the base address as 0,
-  or omitting it all together.
-
-  crashkernel=256M@0
-  or
-  crashkernel=256M
-
-  If the start address is specified, note that the start address of the
-  kernel will be aligned to 64Mb, so if the start address is not then
-  any space below the alignment point will be wasted.
+(To be filled)
 
 
 Boot into System Kernel
@@ -264,10 +243,6 @@ Boot into System Kernel
 
    On ppc64, use "crashkernel=128M@32M".
 
-   On ia64, 256M@256M is a generous value that typically works.
-   The region may be automatically placed on ia64, see the
-   dump-capture kernel config option notes above.
-
 Load the Dump-capture Kernel
 ============================
 
@@ -286,8 +261,7 @@ For x86_64:
 For ppc64:
 	- Use vmlinux
 For ia64:
-	- Use vmlinux or vmlinuz.gz
-
+	(To be filled)
 
 If you are using a uncompressed vmlinux image then use following command
 to load dump-capture kernel.
@@ -303,19 +277,18 @@ to load dump-capture kernel.
    --initrd=<initrd-for-dump-capture-kernel> \
    --append="root=<root-dev> <arch-specific-options>"
 
-Please note, that --args-linux does not need to be specified for ia64.
-It is planned to make this a no-op on that architecture, but for now
-it should be omitted
-
 Following are the arch specific command line options to be used while
 loading dump-capture kernel.
 
-For i386, x86_64 and ia64:
+For i386 and x86_64:
 	"init 1 irqpoll maxcpus=1"
 
 For ppc64:
 	"init 1 maxcpus=1 noirqdistrib"
 
+For IA64
+	(To be filled)
+
 
 Notes on loading the dump-capture kernel: