## Automatically generated incremental diff
## From:   linux-2.0.37-pre12
## To:     linux-2.0.37
## Robot:  $Id: make-incremental-diff,v 1.7 2001/12/04 05:19:54 hpa Exp $

diff -urN linux-2.0.37-pre12/Documentation/CodingStyle linux/Documentation/CodingStyle
--- linux-2.0.37-pre12/Documentation/CodingStyle	Mon Jul 13 13:47:25 1998
+++ linux/Documentation/CodingStyle	Mon Dec  3 21:46:57 2001
@@ -8,7 +8,7 @@
 at least consider the points made here. 
 
 First off, I'd suggest printing out a copy of the GNU coding standards,
-and NOT read it.  Burn them, it's a great symbolic gesture. 
+and NOT reading it.  Burn them, it's a great symbolic gesture. 
 
 Anyway, here goes:
 
@@ -59,7 +59,8 @@
 Heretic people all over the world have claimed that this inconsistency
 is ...  well ...  inconsistent, but all right-thinking people know that
 (a) K&R are _right_ and (b) K&R are right.  Besides, functions are
-special anyway (you can't nest them in C). 
+special anyway (you can't nest them in C (well, you can in gcc, actually,
+but this is horribly nonstandard, so we will ignore it)). 
 
 Note that the closing brace is empty on a line of its own, _except_ in
 the cases where it is followed by a continuation of the same statement,
diff -urN linux-2.0.37-pre12/Documentation/Configure.help linux/Documentation/Configure.help
--- linux-2.0.37-pre12/Documentation/Configure.help	Mon Dec  3 21:46:54 2001
+++ linux/Documentation/Configure.help	Mon Dec  3 21:46:57 2001
@@ -58,6 +58,29 @@
   you say Y here, you will be offered the choice of using features or
   drivers that are currently considered to be in the alpha-test phase.
 
+Symmetric Multi Processing
+CONFIG_SMP
+  This enables support for systems with more than one CPU.  If you have a
+  system with only one CPU, like most personal computers, say N.  If you
+  have a system with more than one CPU, say Y.
+
+  A non-SMP kernel will run on any machine, but will use only one CPU of
+  a multi-CPU machine.  An SMP kernel will run on many, but not all,
+  single-CPU machines.  On a single-CPU machine, a non-SMP kernel
+  will run faster than an SMP kernel.
+
+  People using multiprocessor machines should also say Y to "Enhanced
+  Real Time Clock Support", below.  The "Advanced Power Management"
+  code will be disabled in an SMP kernel.
+
+  If you don't know what to do here, say N.
+  
+  See also: Documentation/SMP.txt, Documentation/smp.tex,
+  Documentation/smp.txt, and Documentation/IO-APIC.txt.  Also see the
+  SMP-FAQ on the WWW at http://www.irisa.fr/prive/mentre/smp-faq/ (to
+  browse the WWW, you need to have access to a machine on the Internet
+  that has a program like lynx or netscape).
+  
 Kernel math emulation
 CONFIG_MATH_EMULATION
   Linux can emulate a math coprocessor (used for floating point
@@ -1007,6 +1030,7 @@
   the other hand, if you use a compiler before gcc 2.7 (say "gcc -v"
   to find out), then you have to say "386" or "486" here even if
   running on a Pentium or PPro machine.
+
   If you don't know what to do, say "386".
 
 Compile the kernel into the ELF object format
diff -urN linux-2.0.37-pre12/Documentation/modules.txt linux/Documentation/modules.txt
--- linux-2.0.37-pre12/Documentation/modules.txt	Sun Jun  9 08:01:04 1996
+++ linux/Documentation/modules.txt	Mon Dec  3 21:46:57 2001
@@ -22,7 +22,7 @@
 	make config
 	make dep
 	make clean
-	make zImage or make zlilo
+	make zImage or make bzImage or make zlilo
 
 In "make config", you select what you want to include in the "resident"
 kernel and what features you want to have available as loadable modules.
diff -urN linux-2.0.37-pre12/Documentation/networking/net-modules.txt linux/Documentation/networking/net-modules.txt
--- linux-2.0.37-pre12/Documentation/networking/net-modules.txt	Thu Apr 11 23:49:29 1996
+++ linux/Documentation/networking/net-modules.txt	Mon Dec  3 21:46:57 2001
@@ -15,7 +15,7 @@
 	the less user needs to know, the better.  (There are things that
 	driver developer can use, others should not confuse themselves.)
 
-	In many cases it is highly preferred that insmod:ing is done
+	In many cases it is highly preferred that insmoding is done
 	ONLY with defining an explicit address for the card, AND BY
 	NOT USING AUTO-PROBING!
 
diff -urN linux-2.0.37-pre12/Makefile linux/Makefile
--- linux-2.0.37-pre12/Makefile	Mon Dec  3 21:46:54 2001
+++ linux/Makefile	Mon Dec  3 21:46:57 2001
@@ -360,6 +360,14 @@
 	set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i fastdep; done
 	mv .tmpdepend .depend
 
+# Prepare source tree for RCS version control using Emacs VC;
+# make all needed RCS directories and write-lock nearly everything.
+vc:
+	chmod a-w COPYING CREDITS MAINTAINERS Makefile README Rules.make  
+	find . -type d ! -name "*RCS" -exec mkdir {}/RCS \;
+	find . -type f \( -name *.[chS] -o -name "*Makefile" -o -name "*README*" -o -name "*Config.in" -o -name "*.txt" \) -exec chmod a-w {} \;
+	find Documentation scripts -type f -exec chmod a-w {} \;
+
 MODVERFILE :=
 
 ifdef CONFIG_MODVERSIONS
diff -urN linux-2.0.37-pre12/README linux/README
--- linux-2.0.37-pre12/README	Mon Dec  3 21:46:54 2001
+++ linux/README	Mon Dec  3 21:46:57 2001
@@ -47,7 +47,12 @@
 		gzip -cd linux-2.0.XX.tar.gz | tar xfv -
 
    to get it all put in place. Replace "XX" with the version number of the
-   latest kernel.
+   latest kernel. If you use GNU tar, 
+
+		cd /usr/src
+		tar -xzvf linux-2.1.XX.tar.gz
+
+   is equivalent.
 
  - You can also upgrade between 2.0.xx releases by patching.  Each
    patch that is released for 2.0.xx contains only bugfixes.  No