Merge http://linux-isdn.bkbits.net/linux-2.5.make

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.isdn

80 files changed, 534 insertions, 408 deletions

diff --git a/CREDITS b/CREDITS
index 984802bbf1d0..8dc1819b0f78 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2981,6 +2981,14 @@ S: #102, 686 W. Maude Ave
 S: Sunyvale, CA 94086
 S: USA
 
+N: Michael Still
+E: mikal@stillhq.com
+W: http://www.stillhq.com
+D: Various janitorial patches
+D: mandocs and mandocs_install build targets
+S: (Email me and ask)
+S: Australia
+
 N: Henrik Storner
 E: storner@image.dk
 W: http://www.image.dk/~storner/
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index ec52000ea6f3..4f992e5761dc 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -20,10 +20,11 @@ DOCBOOKS := wanbook.sgml z8530book.sgml mcabook.sgml videobook.sgml \
 # file.tmpl --> file.sgml +--> file.ps  (psdocs)
 #                         +--> file.pdf  (pdfdocs)
 #                         +--> DIR=file  (htmldocs)
+#                         +--> man/      (mandocs)
 
 ###
 # The targets that may be used.
-.PHONY:	sgmldocs psdocs pdfdocs htmldocs clean mrproper
+.PHONY:	sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs
 
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
 sgmldocs: $(BOOKS)
@@ -37,10 +38,18 @@ pdfdocs: $(PDF)
 HTML := $(patsubst %.sgml, %.html, $(BOOKS))
 htmldocs: $(HTML)
 
+MAN := $(patsubst %.sgml, %.9, $(BOOKS))
+mandocs: $(MAN)
+
+installmandocs: mandocs
+	$(MAKEMAN) install Documentation/DocBook/man
+
 ###
 #External programs used
 KERNELDOC = scripts/kernel-doc
 DOCPROC   = scripts/docproc
+SPLITMAN  = $(PERL) $(srctree)/scripts/split-man
+MAKEMAN   = $(PERL) $(srctree)/scripts/makeman
 
 ###
 # DOCPROC is used for two purposes:
@@ -128,6 +137,13 @@ quiet_cmd_db2html = DB2HTML $@
             cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
 
 ###
+# Rule to generate man files - output is placed in the man subdirectory
+
+%.9:	%.sgml
+	$(SPLITMAN) $< $(objtree)/Documentation/DocBook/man "$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)"
+	$(MAKEMAN) convert $(objtree)/Documentation/DocBook/man $<
+
+###
 # Rules to generate postscripts and PNG imgages from .fig format files
 quiet_cmd_fig2eps = FIG2EPS $@
       cmd_fig2eps = fig2dev -Leps $< $@
@@ -157,10 +173,10 @@ quiet_cmd_fig2png = FIG2PNG $@
 # Help targets as used by the top-level makefile
 dochelp:
 	@echo  '  Linux kernel internal documentation in different formats:'
-	@echo  '  sgmldocs (SGML), psdocs (Postscript), pdfdocs (PDF), htmldocs (HTML)'
+	@echo  '  sgmldocs (SGML), psdocs (Postscript), pdfdocs (PDF)'
+	@echo  '  htmldocs (HTML), mandocs (man pages, use installmandocs to install)'
 
 ###
-# clean and mrproper as used by the top-level makefile 
 # Temporary files left by various tools
 clean-files := $(DOCBOOKS) \
 	$(patsubst %.sgml, %.dvi,  $(DOCBOOKS)) \
@@ -171,10 +187,14 @@ clean-files := $(DOCBOOKS) \
 	$(patsubst %.sgml, %.ps,   $(DOCBOOKS)) \
 	$(patsubst %.sgml, %.pdf,  $(DOCBOOKS)) \
 	$(patsubst %.sgml, %.html, $(DOCBOOKS)) \
-	$(patsubst %.fig,%.eps, $(IMG-parportbook)) \
-	$(patsubst %.fig,%.png, $(IMG-parportbook)) \
+	$(patsubst %.sgml, %.9,    $(DOCBOOKS)) \
+	$(patsubst %.fig,%.eps,    $(IMG-parportbook)) \
+	$(patsubst %.fig,%.png,    $(IMG-parportbook)) \
 	$(C-procfs-example)
 
 ifneq ($(wildcard $(patsubst %.html,%,$(HTML))),)
 clean-rule := rm -rf $(wildcard $(patsubst %.html,%,$(HTML)))
 endif
+
+#man put files in man subdir - traverse down
+subdir- := man/
diff --git a/Documentation/DocBook/man/Makefile b/Documentation/DocBook/man/Makefile
new file mode 100644
index 000000000000..4fb7ea0f7ac8
--- /dev/null
+++ b/Documentation/DocBook/man/Makefile
@@ -0,0 +1,3 @@
+# Rules are put in Documentation/DocBook
+
+clean-files := *.9.gz *.sgml manpage.links manpage.refs
diff --git a/Documentation/DocBook/sis900.tmpl b/Documentation/DocBook/sis900.tmpl
index f8d24d47cb10..305b327c8a05 100644
--- a/Documentation/DocBook/sis900.tmpl
+++ b/Documentation/DocBook/sis900.tmpl
@@ -471,8 +471,6 @@ when configuring the kernel. Build the kernel image in the usual way
 </Para>
 
 <Para><screen>
-make dep
-
 make clean
 
 make bzlilo
diff --git a/Documentation/README.DAC960 b/Documentation/README.DAC960
index b6b770ee8dd6..98ea617a0dd6 100644
--- a/Documentation/README.DAC960
+++ b/Documentation/README.DAC960
@@ -212,7 +212,6 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
   patch -p0 < DAC960.patch (if DAC960.patch is included)
   cd linux
   make config
-  make depend
   make bzImage (or zImage)
 
 Then install "arch/i386/boot/bzImage" or "arch/i386/boot/zImage" as your
diff --git a/Documentation/arm/README b/Documentation/arm/README
index 2f45ddd6781a..482571ae0e31 100644
--- a/Documentation/arm/README
+++ b/Documentation/arm/README
@@ -30,9 +30,9 @@ Compilation of kernel
 	eg.
     CROSS_COMPILE=arm-linux-
 
-  Do a 'make config', followed by 'make dep', and finally 'make Image' to
-  build the kernel (arch/arm/boot/Image).  A compressed image can be built
-  by doing a 'make zImage' instead of 'make Image'.
+  Do a 'make config', followed by 'make Image' to build the kernel 
+  (arch/arm/boot/Image).  A compressed image can be built by doing a 
+  'make zImage' instead of 'make Image'.
 
 
 Bug reports etc
diff --git a/Documentation/arm/SA1100/Assabet b/Documentation/arm/SA1100/Assabet
index 10121a423b10..cbbe5587c78d 100644
--- a/Documentation/arm/SA1100/Assabet
+++ b/Documentation/arm/SA1100/Assabet
@@ -16,7 +16,6 @@ To build the kernel with current defaults:
 
 	make assabet_config
 	make oldconfig
-	make dep
 	make zImage
 
 The resulting kernel image should be available in linux/arch/arm/boot/zImage.
diff --git a/Documentation/arm/SA1100/Brutus b/Documentation/arm/SA1100/Brutus
index 98373152fc51..2254c8f0b326 100644
--- a/Documentation/arm/SA1100/Brutus
+++ b/Documentation/arm/SA1100/Brutus
@@ -8,7 +8,6 @@ To compile for Brutus, you must issue the following commands:
 	make brutus_config
 	make config
 	[accept all the defaults]
-	make dep
 	make zImage
 
 The resulting kernel will end up in linux/arch/arm/boot/zImage.  This file
diff --git a/Documentation/arm/SA1100/CERF b/Documentation/arm/SA1100/CERF
index 83354dd7ec3d..bf50c6fdd572 100644
--- a/Documentation/arm/SA1100/CERF
+++ b/Documentation/arm/SA1100/CERF
@@ -26,7 +26,6 @@ will suffice:
 
    make cerf_config
    make xconfig
-   make dep
    make zImage
    cp arch/arm/boot/zImage <TFTP directory>
 
diff --git a/Documentation/arm/SA1100/HUW_WEBPANEL b/Documentation/arm/SA1100/HUW_WEBPANEL
index ffc81818ac29..fd56b48d4833 100644
--- a/Documentation/arm/SA1100/HUW_WEBPANEL
+++ b/Documentation/arm/SA1100/HUW_WEBPANEL
@@ -7,7 +7,6 @@ To build the kernel:
 	make huw_webpanel_config
 	make oldconfig
 	[accept all defaults]
-	make dep
 	make zImage
 
 Mostly of the work is done by:
diff --git a/Documentation/arm/SA1100/Itsy b/Documentation/arm/SA1100/Itsy
index ed62bdf84c31..3b594534323b 100644
--- a/Documentation/arm/SA1100/Itsy
+++ b/Documentation/arm/SA1100/Itsy
@@ -13,7 +13,7 @@ serial console (to see what you're doing).  No other devices have been
 enabled.
 
 To build, do a "make menuconfig" (or xmenuconfig) and select Itsy support.
-Disable Flash and LCD support. and then do a make dep and a make zImage.
+Disable Flash and LCD support. and then do a make zImage.
 Finally, you will need to cd to arch/arm/boot/tools and execute a make there
 to build the params-itsy program used to boot the kernel.
 
diff --git a/Documentation/arm/SA1100/Pangolin b/Documentation/arm/SA1100/Pangolin
index e885a6b4bb24..077a6120e129 100644
--- a/Documentation/arm/SA1100/Pangolin
+++ b/Documentation/arm/SA1100/Pangolin
@@ -8,7 +8,6 @@ To compile for Pangolin, you must issue the following commands:
 
 	make pangolin_config
 	make oldconfig
-	make dep
 	make zImage
 
 Supported peripherals:
diff --git a/Documentation/arm/XScale/ADIFCC/80200EVB b/Documentation/arm/XScale/ADIFCC/80200EVB
index 1be2f340eb78..3762de418f56 100644
--- a/Documentation/arm/XScale/ADIFCC/80200EVB
+++ b/Documentation/arm/XScale/ADIFCC/80200EVB
@@ -35,7 +35,6 @@ Building the Kernel
 change Linux makefile
 make adi_evb_config
 make oldconfig
-make dep
 make zImage
 
 Loading Linux
diff --git a/Documentation/arm/XScale/IOP3XX/IQ80310 b/Documentation/arm/XScale/IOP3XX/IQ80310
index d1d122747df1..5312a5742104 100644
--- a/Documentation/arm/XScale/IOP3XX/IQ80310
+++ b/Documentation/arm/XScale/IOP3XX/IQ80310
@@ -39,7 +39,6 @@ Building the Kernel
 -----------------------------
 make iq80310_config
 make oldconfig
-make dep
 make zImage
 
 This will build an image setup for BOOTP/NFS root support.  To change this,
diff --git a/Documentation/arm/XScale/IOP3XX/IQ80321 b/Documentation/arm/XScale/IOP3XX/IQ80321
index 18d22175108b..e3253279dfd9 100644
--- a/Documentation/arm/XScale/IOP3XX/IQ80321
+++ b/Documentation/arm/XScale/IOP3XX/IQ80321
@@ -37,7 +37,6 @@ Building the Kernel
 -----------------------------
 make iq80321_config
 make oldconfig
-make dep
 make zImage
 
 This will build an image setup for BOOTP/NFS root support.  To change this,
diff --git a/Documentation/cdrom/cm206 b/Documentation/cdrom/cm206
index bc4f9e656544..810368f4f7c4 100644
--- a/Documentation/cdrom/cm206
+++ b/Documentation/cdrom/cm206
@@ -56,7 +56,7 @@ Compiling the kernel
 
 2) then do a 
 	
-	make dep; make clean; make zImage; make modules
+	make clean; make zImage; make modules
 
 3) do the usual things to install a new image (backup the old one, run
    `rdev -R zImage 1', copy the new image in place, run lilo).  Might
diff --git a/Documentation/cdrom/gscd b/Documentation/cdrom/gscd
index 560069e2a94a..d01ca36b5c43 100644
--- a/Documentation/cdrom/gscd
+++ b/Documentation/cdrom/gscd
@@ -37,7 +37,7 @@ configuration for your kernel. If you want to use the GoldStar driver
 like a module, don't select 'GoldStar CDROM support'. By the way, you
 have to include the iso9660 filesystem.
 
-Now start compiling the kernel with 'make dep ; make zImage'.
+Now start compiling the kernel with 'make zImage'.
 If you want to use the driver as a module, you have to do 'make modules' 
 and 'make modules_install', additionally.
 Install your new kernel as usual - maybe you do it with 'make zlilo'.
diff --git a/Documentation/cdrom/sbpcd b/Documentation/cdrom/sbpcd
index 47efedf9194c..c99ae51e78b3 100644
--- a/Documentation/cdrom/sbpcd
+++ b/Documentation/cdrom/sbpcd
@@ -229,7 +229,7 @@ To install:
    second, third, or fourth controller installed, do not say "y" to the 
    secondary Matsushita CD-ROM questions.
 
-3. Then do a "make dep", then make the kernel image ("make zlilo" or similar).
+3. Then make the kernel image ("make zlilo" or similar).
 
 4. Make the device file(s). This step usually already has been done by the
    MAKEDEV script.
diff --git a/Documentation/computone.txt b/Documentation/computone.txt
index 1bc1dd454a65..b62c34f98ff7 100644
--- a/Documentation/computone.txt
+++ b/Documentation/computone.txt
@@ -60,12 +60,11 @@ c) Set address on ISA cards then:
 	or
    edit /etc/modules.conf if needed (module).
 	or both to match this setting.
-d) Run "make dep"
-e) Run "make modules"
-f) Run "make modules_install"
-g) Run "/sbin/depmod -a"
-h) install driver using `modprobe ip2 <options>` (options listed below)
-i) run ip2mkdev (either the script below or the binary version)
+d) Run "make modules"
+e) Run "make modules_install"
+f) Run "/sbin/depmod -a"
+g) install driver using `modprobe ip2 <options>` (options listed below)
+h) run ip2mkdev (either the script below or the binary version)
 
 
 Kernel installation:
@@ -77,13 +76,12 @@ b) Run "make config" or "make menuconfig" or "make xconfig"
 c) Set address on ISA cards then:
 	   edit /usr/src/linux/drivers/char/ip2.c  
            (Optional - may be specified on kernel command line now)
-d) Run "make dep"
-e) Run "make zImage" or whatever target you prefer.
-f) mv /usr/src/linux/arch/i386/boot/zImage to /boot.
-g) Add new config for this kernel into /etc/lilo.conf, run "lilo"
+d) Run "make zImage" or whatever target you prefer.
+e) mv /usr/src/linux/arch/i386/boot/zImage to /boot.
+f) Add new config for this kernel into /etc/lilo.conf, run "lilo"
 	or copy to a floppy disk and boot from that floppy disk.
-h) Reboot using this kernel
-i) run ip2mkdev (either the script below or the binary version)
+g) Reboot using this kernel
+h) run ip2mkdev (either the script below or the binary version)
 
 Kernel command line options:
 
@@ -176,7 +174,6 @@ all cards will operate in polled mode.
 
 If you select the driver as part of the kernel run :
 
-	make depend
 	make zlilo (or whatever you do to create a bootable kernel)
 
 If you selected a module run :
diff --git a/Documentation/filesystems/devfs/README b/Documentation/filesystems/devfs/README
index c4516620de42..3ef858266450 100644
--- a/Documentation/filesystems/devfs/README
+++ b/Documentation/filesystems/devfs/README
@@ -710,9 +710,8 @@ The Kernel
 Finally, you need to make sure devfs is compiled into your kernel. Set
 CONFIG_EXPERIMENTAL=y, CONFIG_DEVFS_FS=y and CONFIG_DEVFS_MOUNT=y by
 using favourite configuration tool (i.e. make config or
-make xconfig) and then make dep; make clean and then
-recompile your kernel and modules. At boot, devfs will be mounted onto
-/dev.
+make xconfig) and then make clean and then recompile your kernel and 
+modules. At boot, devfs will be mounted onto /dev.
 
 If you encounter problems booting (for example if you forgot a
 configuration step), you can pass devfs=nomount at the kernel
diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
index a9029185b1ae..031c8d814337 100644
--- a/Documentation/isdn/README.HiSax
+++ b/Documentation/isdn/README.HiSax
@@ -504,7 +504,7 @@ to e.g. the Internet:
      cd /usr/src/linux
      make menuconfig
      <ISDN subsystem - ISDN support -- HiSax>
-     make clean; make dep; make zImage; make modules; make modules_install
+     make clean; make zImage; make modules; make modules_install
 2. Install the new kernel
      cp /usr/src/linux/arch/i386/boot/zImage /etc/kernel/linux.isdn
      vi /etc/lilo.conf
diff --git a/Documentation/kbuild/00-INDEX b/Documentation/kbuild/00-INDEX
index 03db5e5d208d..ca00fb379328 100644
--- a/Documentation/kbuild/00-INDEX
+++ b/Documentation/kbuild/00-INDEX
@@ -1,10 +1,6 @@
 00-INDEX
     	- this file: info on the kernel build process
-commands.txt
-	- overview of kbuild commands
 kconfig-language.txt
 	- specification of Config Language, the language in Kconfig files
-random.txt
-	- description of generic config targets
 makefiles.txt
 	- developer information for linux kernel makefiles
diff --git a/Documentation/kbuild/commands.txt b/Documentation/kbuild/commands.txt
deleted file mode 100644
index d61e1a16e75c..000000000000
--- a/Documentation/kbuild/commands.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-Overview of Kbuild Commands
-24 January 1999
-Michael Elizabeth Chastain, <mailto:mec@shout.net>
-
-
-
-=== Introduction
-
-Someday we'll get our arms around all this stuff and clean it up
-a little!  Meanwhile, this file describes the system as it is today.
-
-
-
-=== Quick Start
-
-If you are building a kernel for the first time, here are the commands
-you need:
-
-    make config
-    make dep
-    make bzImage
-
-Instead of 'make config', you can run 'make menuconfig' for a full-screen
-text interface, or 'make xconfig' for an X interface using TCL/TK.
-
-'make bzImage' will leave your new kernel image in arch/i386/boot/bzImage.
-You can also use 'make bzdisk' or 'make bzlilo'.
-
-See the lilo documentation for more information on how to use lilo.
-You can also use the 'loadlin' program to boot Linux from MS-DOS.
-
-Some computers won't work with 'make bzImage', either due to hardware
-problems or very old versions of lilo or loadlin.  If your kernel image
-is small, you may use 'make zImage', 'make zdisk', or 'make zlilo'
-on theses systems.
-
-If you find a file name 'vmlinux' in the top directory of the source tree,
-just ignore it.  This is an intermediate file and you can't boot from it.
-
-Other architectures: the information above is oriented towards the
-i386.  On other architectures, there are no 'bzImage' files; simply
-use 'zImage' or 'vmlinux' as appropriate for your architecture.
-
-Note: the difference between 'zImage' files and 'bzImage' files is that
-'bzImage' uses a different layout and a different loading algorithm,
-and thus has a larger capacity.  Both files use gzip compression.
-The 'bz' in 'bzImage' stands for 'big zImage', not for 'bzip'!
-
-
-
-=== Top Level Makefile targets
-
-Here are the targets available at the top level:
-
-    make config, make oldconfig, make menuconfig, make xconfig
-
-	Configure the Linux kernel.  You must do this before almost
-	anything else.
-
-	config		line-oriented interface
-	oldconfig	line-oriented interface, re-uses old values
-	menuconfig	curses-based full-screen interface
-	xconfig		X window system interface
-
-    make checkconfig
-
-	This runs a little perl script that checks the source tree for
-	missing instances of #include <linux/config.h>.  Someone needs to
-	do this occasionally, because the C preprocessor will silently give
-	bad results if these symbols haven't been included (it treats
-	undefined symbols in preprocessor directives as defined to 0).
-	Superfluous uses of #include <linux/config.h> are also reported,
-	but you can ignore these, because smart CONFIG_* dependencies
-	make them harmless.
-
-	You can run 'make checkconfig' without configuring the kernel.
-	Also, 'make checkconfig' does not modify any files.
-
-    make checkhelp
-
-	This runs another little perl script that checks the source tree
-	for options that are in Config.in files but are not documented
-	in scripts/Configure.help.  Again, someone needs to do this
-	occasionally.  If you are adding configuration options, it's
-	nice if you do it before you publish your patch!
-
-	You can run 'make checkhelp' without configuring the kernel.
-	Also, 'make checkhelp' does not modify any files.
-
-    make dep, make depend
-
-	'make dep' is a synonym for the long form, 'make depend'.
-
-	This command does two things.  First, it computes dependency
-	information about which .o files depend on which .h files.
-	It records this information in a top-level file named .hdepend
-	and in one file per source directory named .depend.
-
-	Second, if you have CONFIG_MODVERSIONS enabled, 'make dep'
-	computes symbol version information for all of the files that
-	export symbols (note that both resident and modular files may
-	export symbols).
-
-	If you do not enable CONFIG_MODVERSIONS, you only have to run
-	'make dep' once, right after the first time you configure
-	the kernel.  The .hdepend files and the .depend file are
-	independent of your configuration.
-
-	If you do enable CONFIG_MODVERSIONS, you must run 'make dep'
-	every time you change your configuration, because the module
-	symbol version information depends on the configuration.
-
-[to be continued ...]
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 58624e4bae80..019558520b35 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -216,8 +216,8 @@ more details, with real examples.
 
 --- 3.5 Library file goals - lib-y
 
-	Objects listed with obj-* is used for modules or
-	are combined in a built-in.o for that specific directory.
+	Objects listed with obj-* are used for modules or
+	combined in a built-in.o for that specific directory.
 	There is also the possibility to list objects that will
 	be included in a library, lib.a.
 	All objects listed with lib-y are combined in a single
diff --git a/Documentation/kbuild/random.txt b/Documentation/kbuild/random.txt
deleted file mode 100644
index 02a23c583687..000000000000
--- a/Documentation/kbuild/random.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Code by Ghozlane Toumi <gtoumi@messel.emse.fr>, documentation by
-Keith Owens <kaos@ocs.com.au>
-
-In addition to the normal config targets you can make
-
-  randconfig	random configuration.
-
-  allyes	reply 'y' to all options, maximal kernel.
-
-  allno		reply 'n' to all options, minimal kernel.
-
-  allmod	build everything as modules where possible.
-
-
-All random configurations will satisfy the config rules, that is, all
-configurations should be valid.  Any build errors indicate bugs in the
-config dependency rules or in the Makefiles.
-
-You can constrain the random configuration, e.g. you may want to force
-the use of modules or the absence of /proc or cramfs must be a module.
-If file .force_default exists then it is read to preset selected
-values, all other values will be randomly selected, subject to the
-config rules.  The syntax of .force_default is:
-
-CONFIG_foo=value
-  Force this value, for example CONFIG_MODULES=y, CONFIG_PROC_FS=n,
-  CONFIG_RAMFS=m.
-
-# CONFIG_foo is not set
-  Equivalent to CONFIG_foo=n, supported because this is the format used
-  in .config.  NOTE: The leading '#' is required.
-
-# list CONFIG_foo val1,val2,val3
-  Pick a value for CONFIG_foo from the list.  CONFIG_foo must be an int
-  or hex option.  NOTE: The leading '#' is required.
-
-# range CONFIG_foo min max
-  Pick a value for CONFIG_foo in the range min <=> max.  CONFIG_foo
-  must be an int option.  NOTE: The leading '#' is required.
-
-If you have repeated settings of the same option in .force_default then
-values take precedence over lists which take precedence over range.
-Within each group the last setting for an option is used.
-
-Answers "randomised" are bool(), tristate(), dep_tristate() and
-choice().  Unless specified in .force_default, int, hex, and string
-options use the default values from config.in.
diff --git a/Documentation/moxa-smartio b/Documentation/moxa-smartio
index 75efa68409d7..fe24ecc6372e 100644
--- a/Documentation/moxa-smartio
+++ b/Documentation/moxa-smartio
@@ -254,19 +254,18 @@ Content
 
 	   a. cd /usr/src/linux
 	   b. make clean			     /* take a few minutes */
-	   c. make dep				     /* take a few minutes */
-	   d. make bzImage		   /* take probably 10-20 minutes */
-	   e. Backup original boot kernel.		  /* optional step */
-	   f. cp /usr/src/linux/arch/i386/boot/bzImage /boot/vmlinuz
-	   g. Please make sure the boot kernel (vmlinuz) is in the
+	   c. make bzImage		   /* take probably 10-20 minutes */
+	   d. Backup original boot kernel.		  /* optional step */
+	   e. cp /usr/src/linux/arch/i386/boot/bzImage /boot/vmlinuz
+	   f. Please make sure the boot kernel (vmlinuz) is in the
 	      correct position. If you use 'lilo' utility, you should
 	      check /etc/lilo.conf 'image' item specified the path
 	      which is the 'vmlinuz' path, or you will load wrong
 	      (or old) boot kernel image (vmlinuz).
-	   h. chmod 400 /vmlinuz
-	   i. lilo
-	   j. rdev -R /vmlinuz 1
-	   k. sync
+	   g. chmod 400 /vmlinuz
+	   h. lilo
+	   i. rdev -R /vmlinuz 1
+	   j. sync
 
 	  Note that if the result of "make zImage" is ERROR, then you have to
 	  go back to Linux configuration Setup. Type "make config" in directory
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt
index efbf441bae40..083d24752b83 100644
--- a/Documentation/networking/DLINK.txt
+++ b/Documentation/networking/DLINK.txt
@@ -93,7 +93,6 @@ Released 1994-06-13
 	  (else included in the kernel:)
 	  #  make config (answer yes on CONFIG _NET, _INET and _DE600 or _DE620)
 	  # make clean
-	  # make depend
 	  # make zImage (or whatever magic you usually do)
 
 	o I use lilo to boot multiple kernels, so that I at least
diff --git a/Documentation/networking/arcnet.txt b/Documentation/networking/arcnet.txt
index 86188673f97a..bf13f782e38c 100644
--- a/Documentation/networking/arcnet.txt
+++ b/Documentation/networking/arcnet.txt
@@ -108,7 +108,6 @@ All you will need to do in order to install the driver is:
 	make config
 		(be sure to choose ARCnet in the network devices 
 		and at least one chipset driver.)
-	make dep
 	make clean
 	make zImage
 	
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index 386a101133dd..188beb7d6a17 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -437,8 +437,8 @@ Also add:
 into the /usr/src/linux/drivers/net directory.
 
 
-3.) Go to /usr/src/linux directory and run 'make config' followed by 'make dep' 
-and finally 'make' (or make bzImage) to rebuild the kernel. 
+3.) Go to /usr/src/linux directory and run 'make config' followed by 'make' 
+(or make bzImage) to rebuild the kernel. 
 
 4.) Use the DOS 'setup' utility to disable plug and play on the NIC.
 
diff --git a/Documentation/networking/sis900.txt b/Documentation/networking/sis900.txt
index cab486f5ba8a..bddffd7385ae 100644
--- a/Documentation/networking/sis900.txt
+++ b/Documentation/networking/sis900.txt
@@ -215,8 +215,6 @@ Building the driver into kernel
    on "SiS 900/7016 PCI Fast Ethernet Adapter support" when configuring
    the kernel. Build the kernel image in the usual way
    
-make dep
-
 make clean
 
 make bzlilo
diff --git a/Documentation/s390/3270.txt b/Documentation/s390/3270.txt
index 33b4ff6a6be3..d06900379b55 100644
--- a/Documentation/s390/3270.txt
+++ b/Documentation/s390/3270.txt
@@ -79,7 +79,6 @@ Here are the installation steps in detail:
 		(If you wish to disable 3215 console support, edit
 		.config; change CONFIG_TN3215's value to "n";
 		and rerun "make oldconfig".)
-		make dep
 		make image
 		make modules
 		make modules_install
diff --git a/Documentation/scsi/BusLogic.txt b/Documentation/scsi/BusLogic.txt
index 3ddc8b1f10a9..2ef5db0452b0 100644
--- a/Documentation/scsi/BusLogic.txt
+++ b/Documentation/scsi/BusLogic.txt
@@ -597,7 +597,6 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
   patch -p0 < BusLogic.patch (only for 2.0.33 and below)
   cd linux
   make config
-  make depend
   make zImage
 
 Then install "arch/i386/boot/zImage" as your standard kernel, run lilo if
diff --git a/Documentation/scsi/cpqfc.txt b/Documentation/scsi/cpqfc.txt
index d257e34a4443..dd33e61c0645 100644
--- a/Documentation/scsi/cpqfc.txt
+++ b/Documentation/scsi/cpqfc.txt
@@ -102,7 +102,6 @@ using "qa_test" (esp. io_test script) suite modified from Unix tests.
 Installation:
 make menuconfig
   (select SCSI low-level, Compaq FC HBA)
-make dep
 make modules
 make modules_install
 
diff --git a/Documentation/smp.txt b/Documentation/smp.txt
index 130d6478ac8c..82fc50b6305d 100644
--- a/Documentation/smp.txt
+++ b/Documentation/smp.txt
@@ -15,7 +15,7 @@ with this one.
 Of course you should time how long each build takes :-)
 Example:
    make config
-   time -v sh -c 'make dep ; make clean install modules modules_install'
+   time -v sh -c 'make clean install modules modules_install'
 
 If you are using some Compaq MP compliant machines you will need to set
 the operating system in the BIOS settings to "Unixware" - don't ask me
diff --git a/Documentation/sound/oss/Introduction b/Documentation/sound/oss/Introduction
index 90b41f8c3b4c..d6d5f33dc114 100644
--- a/Documentation/sound/oss/Introduction
+++ b/Documentation/sound/oss/Introduction
@@ -114,8 +114,7 @@ the README takes precedence.
     Blaster, etc., select M (module) for OSS sound modules.
     [thanks to Marvin Stodolsky <stodolsk@erols.com>]A
 
-5.  Make the kernel (e.g., make dep ; make bzImage), and install
-    the kernel.
+5.  Make the kernel (e.g., make bzImage), and install the kernel.
 
 6.  Make the modules and install them (make modules; make modules_install).
 
diff --git a/Documentation/sound/oss/README.OSS b/Documentation/sound/oss/README.OSS
index ac1eaf5e977d..fd42b05b2f55 100644
--- a/Documentation/sound/oss/README.OSS
+++ b/Documentation/sound/oss/README.OSS
@@ -722,8 +722,8 @@ To configure the driver, run "make config" in the kernel source directory
 (after the questions about mouse, CD-ROM, ftape, etc. support).  Questions
 about options for sound will then be asked.
 
-After configuring the kernel and sound driver, run "make dep" and compile
-the kernel following instructions in the kernel README.
+After configuring the kernel and sound driver and compile the kernel 
+following instructions in the kernel README.
 
 The sound driver configuration dialog
 -------------------------------------
diff --git a/Documentation/sound/oss/Wavefront b/Documentation/sound/oss/Wavefront
index 3b936a2bcc65..803ffd408c2a 100644
--- a/Documentation/sound/oss/Wavefront
+++ b/Documentation/sound/oss/Wavefront
@@ -139,7 +139,6 @@ PART THREE: configure your kernel
 	      soundcards you want support for)
 
 
-   make dep
    make boot
    .
    .
diff --git a/Documentation/telephony/ixj.txt b/Documentation/telephony/ixj.txt
index ce67a823c33d..621024fd3a18 100644
--- a/Documentation/telephony/ixj.txt
+++ b/Documentation/telephony/ixj.txt
@@ -363,7 +363,7 @@ modules.  The command string for the final compile looks like this:
     1.  cp .config /tmp
     2.  make mrproper
     3.  cp /tmp/.config .
-    4.	make dep;make clean;make bzImage;make modules;make modules_install
+    4.	make clean;make bzImage;make modules;make modules_install
 
 This rebuilds both the kernel and all the modules and makes sure they all 
 have the same linkages.  This generally solves the problem once the new 
diff --git a/Documentation/video4linux/CQcam.txt b/Documentation/video4linux/CQcam.txt
index 8bbe61103905..3c5d25da80f7 100644
--- a/Documentation/video4linux/CQcam.txt
+++ b/Documentation/video4linux/CQcam.txt
@@ -50,8 +50,7 @@ configuration.  The appropriate flags are:
   With these flags, the kernel should compile and install the modules.
 To record and monitor the compilation, I use:
 
- (make dep; \
-  make zlilo ; \
+ (make zlilo ; \
   make modules; \
   make modules_install ; 
   depmod -a ) &>log &
diff --git a/Makefile b/Makefile
index e8bbeff0975b..a05783fad2cb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ EXTRAVERSION =
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
-# More info can be located in ./Documentation/kbuild
+# More info can be located in ./README
 # Comments in this file are targeted only to the developer, do not
 # expect to learn how to build the kernel reading this file.
 
@@ -112,22 +112,8 @@ endif
 
 export KBUILD_MODULES KBUILD_BUILTIN KBUILD_VERBOSE KBUILD_CHECKSRC
 
-# Beautify output
-# ---------------------------------------------------------------------------
-#
-# Normally, we echo the whole command before executing it. By making
-# that echo $($(quiet)$(cmd)), we now have the possibility to set
-# $(quiet) to choose other forms of output instead, e.g.
-#
-#         quiet_cmd_cc_o_c = Compiling $(RELDIR)/$@
-#         cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $<
-#
-# If $(quiet) is empty, the whole command will be printed.
-# If it is set to "quiet_", only the short version will be printed. 
-# If it is set to "silent_", nothing wil be printed at all, since
-# the variable $(silent_cmd_cc_o_c) doesn't exist.
-
 # To put more focus on warnings, less verbose as default
+# Use 'make V=1' to see the full commands
 
 ifdef V
   ifeq ("$(origin V)", "command line")
@@ -138,6 +124,9 @@ ifndef KBUILD_VERBOSE
   KBUILD_VERBOSE = 0 
 endif
 
+# Call sparse as part of compilation of C files
+# Use 'make C=1' to enable sparse checking
+
 ifdef C
   ifeq ("$(origin C)", "command line")
     KBUILD_CHECKSRC = $(C)
@@ -147,6 +136,7 @@ ifndef KBUILD_CHECKSRC
   KBUILD_CHECKSRC = 0
 endif
 
+# Do not print 'Entering directory ...'
 
 MAKEFLAGS += --no-print-directory
 
@@ -155,8 +145,28 @@ MAKEFLAGS += --no-print-directory
 
 #MAKEFLAGS += -rR
 
-#	If the user wants quiet mode, echo short versions of the commands 
-#	only
+# Beautify output
+# ---------------------------------------------------------------------------
+#
+# Normally, we echo the whole command before executing it. By making
+# that echo $($(quiet)$(cmd)), we now have the possibility to set
+# $(quiet) to choose other forms of output instead, e.g.
+#
+#         quiet_cmd_cc_o_c = Compiling $(RELDIR)/$@
+#         cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $<
+#
+# If $(quiet) is empty, the whole command will be printed.
+# If it is set to "quiet_", only the short version will be printed. 
+# If it is set to "silent_", nothing wil be printed at all, since
+# the variable $(silent_cmd_cc_o_c) doesn't exist.
+#
+# A simple variant is to prefix commands with $(Q) - that's usefull
+# for commands that shall be hidden in non-verbose mode.
+#
+#	$(Q)ln $@ :<
+#
+# If KBUILD_VERBOSE equals 0 then the above command will be hidden.
+# If KBUILD_VERBOSE equals 1 then the above command is displayed.
 
 ifeq ($(KBUILD_VERBOSE),1)
   quiet =
@@ -166,8 +176,8 @@ else
   Q = @
 endif
 
-#	If the user is running make -s (silent mode), suppress echoing of
-#	commands
+# If the user is running make -s (silent mode), suppress echoing of
+# commands
 
 ifneq ($(findstring s,$(MAKEFLAGS)),)
   quiet=silent_
@@ -175,7 +185,7 @@ endif
 
 export quiet Q KBUILD_VERBOSE
 
-#	Paths to obj / src tree
+# Paths to obj / src tree
 
 src	:= .
 obj	:= .
@@ -184,7 +194,7 @@ objtree := .
 
 export srctree objtree
 
-# 	Make variables (CC, etc...)
+# Make variables (CC, etc...)
 
 AS		= $(CROSS_COMPILE)as
 LD		= $(CROSS_COMPILE)ld
@@ -213,9 +223,9 @@ AFLAGS_KERNEL	=
 NOSTDINC_FLAGS  = -nostdinc -iwithprefix include
 
 CPPFLAGS	:= -D__KERNEL__ -Iinclude
-CFLAGS 		:= $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
+CFLAGS 		:= -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
 	  	   -fno-strict-aliasing -fno-common
-AFLAGS		:= -D__ASSEMBLY__ $(CPPFLAGS)
+AFLAGS		:= -D__ASSEMBLY__
 
 export	VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
 	CONFIG_SHELL TOPDIR HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
@@ -236,7 +246,7 @@ depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
 noconfig_targets := xconfig gconfig menuconfig config oldconfig randconfig \
 		    defconfig allyesconfig allnoconfig allmodconfig \
 		    clean mrproper distclean rpm \
-		    help tags TAGS cscope sgmldocs psdocs pdfdocs htmldocs \
+		    help tags TAGS cscope %docs \
 		    checkconfig checkhelp checkincludes
 
 RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \) -prune -o
@@ -271,6 +281,10 @@ endif
 
 include arch/$(ARCH)/Makefile
 
+# Let architecture Makefiles change CPPFLAGS if needed
+CFLAGS += $(CPPFLAGS) $(CFLAGS)
+AFLAGS += $(CPPFLAGS) $(AFLAGS)
+
 core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/
 
 SUBDIRS		+= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
@@ -308,6 +322,10 @@ ifndef CONFIG_FRAME_POINTER
 CFLAGS		+= -fomit-frame-pointer
 endif
 
+ifdef CONFIG_DEBUG_INFO
+CFLAGS		+= -g
+endif
+
 #
 # INSTALL_PATH specifies where to place the updated kernel and system map
 # images.  Uncomment if you want to place them anywhere other than root.
@@ -352,7 +370,7 @@ endef
 #	set -e makes the rule exit immediately on error
 
 define rule_vmlinux__
-	set -e;								\
+	+set -e;							\
 	$(if $(filter .tmp_kallsyms%,$^),,				\
 	  echo '  GEN     .version';					\
 	  . $(srctree)/scripts/mkversion > .tmp_version;		\
@@ -824,12 +842,12 @@ help:
 	@echo  '  make C=1   [targets] Check all c source with checker tool'
 	@echo  ''
 	@echo  'Execute "make" or "make all" to build all targets marked with [*] '
-	@echo  'For further info browse Documentation/kbuild/*'
+	@echo  'For further info see the ./README file'
 
 
 # Documentation targets
 # ---------------------------------------------------------------------------
-sgmldocs psdocs pdfdocs htmldocs: scripts/docproc FORCE
+%docs: scripts/docproc FORCE
 	$(Q)$(MAKE) $(build)=Documentation/DocBook $@
 
 # Scripts to check various things for consistency
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 40b3005327d8..97f9e14cf504 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -847,6 +847,15 @@ config DEBUG_SEMAPHORE
 	  verbose debugging messages.  If you suspect a semaphore problem or a
 	  kernel hacker asks for this option then say Y.  Otherwise say N.
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+
 endmenu
 
 source "security/Kconfig"
diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index 9ee21e0f1ec1..fa248f63ea9f 100644
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -11,7 +11,6 @@
 NM := $(NM) -B
 
 LDFLAGS_vmlinux	:= -static -N #-relax
-LDFLAGS_BLOB	:= --format binary --oformat elf64-alpha
 cflags-y	:= -pipe -mno-fp-regs -ffixed-8
 
 # Determine if we can use the BWX instructions with GAS.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5d14a8e740aa..6beac52f35b3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1069,6 +1069,15 @@ config KALLSYMS
 	  symbolic stack backtraces. This increases the size of the kernel
 	  somewhat, as all symbols have to be loaded into the kernel image.
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+
 # These options are only for real kernel hackers who want to get their hands dirty. 
 config DEBUG_LL
 	bool "Kernel low-level debugging functions"
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index b62382271dad..9b6f5e995f10 100644
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -531,6 +531,15 @@ config KALLSYMS
 	  symbolic stack backtraces. This increases the size of the kernel
 	  somewhat, as all symbols have to be loaded into the kernel image.
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+
 # These options are only for real kernel hackers who want to get their hands dirty. 
 config DEBUG_LL
 	bool "Kernel low-level debugging functions"
diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index 105db70dbba1..5ed84ef94ee8 100644
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -34,7 +34,6 @@ CFLAGS += -D__linux__
 CFLAGS += -DUTS_SYSNAME=\"uClinux\" -DTARGET=$(BOARD)
 AFLAGS += -DPLATFORM=$(PLATFORM) -DTARGET=$(BOARD) -DMODEL=$(MODEL) $(cflags-y)
 LDFLAGS += $(ldflags-y)
-LDFLAGS_BLOB :=  --format binary --oformat elf32-h8300
 
 CROSS_COMPILE = h8300-elf-
 #HEAD := arch/$(ARCH)/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index b7e307062a66..f0c0f279ca88 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1381,6 +1381,15 @@ config DEBUG_HIGHMEM
 	  This options enables addition error checking for high memory systems.
 	  Disable for production systems.
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 config KALLSYMS
 	bool "Load all symbols for debugging/kksymoops"
 	help
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 8292045271c8..01f4853083a3 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -18,7 +18,6 @@
 LDFLAGS		:= -m elf_i386
 OBJCOPYFLAGS	:= -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux :=
-LDFLAGS_BLOB	:= --format binary --oformat elf32-i386
 
 CFLAGS += -pipe
 
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ff84fd87198c..16c220114bce 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -809,6 +809,15 @@ config IA64_DEBUG_IRQ
 	  and restore instructions.  It's useful for tracking down spinlock
 	  problems, but slow!  If you're unsure, select N.
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 endmenu
 
 source "security/Kconfig"
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 1cd2b2054a97..eaa26f093175 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -27,9 +27,7 @@ GCC_MINOR_VERSION=$(shell $(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' |
 
 GAS_STATUS=$(shell arch/ia64/scripts/check-gas $(CC) $(OBJDUMP))
 
-arch-cppflags	:= $(shell arch/ia64/scripts/toolchain-flags $(CC) $(OBJDUMP))
-cflags-y	+= $(arch-cppflags)
-AFLAGS		+= $(arch-cppflags)
+CPPFLAGS	+= $(shell arch/ia64/scripts/toolchain-flags $(CC) $(OBJDUMP))
 
 ifeq ($(GAS_STATUS),buggy)
 $(error Sorry, you need a newer version of the assember, one that is built from	\
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 7e5fdb8899c0..93f50a9987c8 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -1269,6 +1269,15 @@ config DEBUG_BUGVERBOSE
 	bool "Verbose BUG() reporting"
 	depends on DEBUG_KERNEL
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 endmenu
 
 source "security/Kconfig"
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 45aaa7379a0b..2091b1c22243 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -19,7 +19,6 @@ COMPILE_ARCH = $(shell uname -m)
 # override top level makefile
 AS += -m68020
 LDFLAGS := -m m68kelf
-LDFLAGS_BLOB := --format binary --oformat elf32-m68k
 ifneq ($(COMPILE_ARCH),$(ARCH))
 	# prefix for cross-compiling binaries
 	CROSS_COMPILE = m68k-linux-
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index e7f435a4f96c..53fb22010a76 100644
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -85,8 +85,6 @@ CFLAGS += -O2 -g
 CFLAGS += -D__linux__
 CFLAGS += -DUTS_SYSNAME=\"uClinux\"
 
-LDFLAGS_BLOB	:= --format binary --oformat elf32-m68k
-
 head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
 
 CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 205f740f6ee1..a5705b052ffc 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -295,6 +295,15 @@ config KALLSYMS
 	  symbolic stack backtraces. This increases the size of the kernel
 	  somewhat, as all symbols have to be loaded into the kernel image.
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 endmenu
 
 source "security/Kconfig"
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 0360608cb28c..f615675a7442 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -20,13 +20,11 @@
 ifdef CONFIG_PARISC64
 CROSS_COMPILE	:= hppa64-linux-
 UTS_MACHINE	:= parisc64
-LDFLAGS_BLOB	:= --format binary --oformat elf64-hppa-linux
 else
 MACHINE := $(subst 64,,$(shell uname -m))
 ifneq ($(MACHINE),parisc)
 CROSS_COMPILE	:= hppa-linux-
 endif
-LDFLAGS_BLOB	:= --format binary --oformat elf32-hppa-linux
 endif
 
 FINAL_LD=$(CROSS_COMPILE)ld --warn-common --warn-section-align 
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index d065bede9379..0dccb5f32977 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1479,6 +1479,15 @@ config KGDB
 	  debugger.  See <http://kgdb.sourceforge.net/> for more information.
 	  Unless you are intending to debug the kernel, say N here.
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 choice
 	prompt "Serial Port"
 	depends on KGDB
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index a4c2f615f336..033f661c84a1 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -13,7 +13,6 @@
 # This must match PAGE_OFFSET in include/asm-ppc/page.h.
 KERNELLOAD	:= $(CONFIG_KERNEL_START)
 
-LDFLAGS_BLOB	:= --format binary --oformat elf32-powerpc
 LDFLAGS_vmlinux	:= -Ttext $(KERNELLOAD) -Bstatic
 CPPFLAGS	+= -Iarch/$(ARCH)
 AFLAGS		+= -Iarch/$(ARCH)
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 55ed1d86b088..18f7abaa8fff 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -421,6 +421,15 @@ config PPCDBG
 	bool "Include PPCDBG realtime debugging"
 	depends on DEBUG_KERNEL
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 endmenu
 
 source "security/Kconfig"
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 51439552295b..6758cfc60585 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -17,7 +17,6 @@ KERNELLOAD	:= 0xc000000000000000
 
 LDFLAGS		:= -m elf64ppc
 LDFLAGS_vmlinux	:= -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
-LDFLAGS_BLOB	:= --format binary --oformat elf64-powerpc
 CFLAGS		+= -msoft-float -pipe -Wno-uninitialized -mminimal-toc \
 		-mtraceback=full -mcpu=power4
 
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ff169f0f9b6f..02b94fd19332 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -278,6 +278,15 @@ config KALLSYMS
 	  symbolic stack backtraces. This increases the size of the kernel
 	  somewhat, as all symbols have to be loaded into the kernel image.
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 config DEBUG_SPINLOCK_SLEEP
 	bool "Sleep-inside-spinlock checking"
 	help
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index ca75bcedc47f..cd690cd15921 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -15,7 +15,6 @@
 
 ifdef CONFIG_ARCH_S390_31
 LDFLAGS		:= -m elf_s390
-LDFLAGS_BLOB	:= --format binary --oformat elf32-s390
 CFLAGS		+= -m31
 UTS_MACHINE	:= s390
 endif
@@ -23,7 +22,6 @@ endif
 ifdef CONFIG_ARCH_S390X
 LDFLAGS		:= -m elf64_s390
 MODFLAGS	+= -fpic -D__PIC__
-LDFLAGS_BLOB	:= --format binary --oformat elf64-s390
 CFLAGS		+= -m64
 UTS_MACHINE	:= s390x
 endif
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index e965c9baaf93..b9463239a290 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -50,10 +50,8 @@ LDFLAGS_vmlinux     += -e _stext
 
 ifdef CONFIG_CPU_LITTLE_ENDIAN
 LDFLAGS_vmlinux     +=  --defsym 'jiffies=jiffies_64' -EL
-LDFLAGS_BLOB    :=--format binary --oformat elf32-sh-linux
 else
 LDFLAGS_vmlinux     +=  --defsym 'jiffies=jiffies_64+4' -EB
-LDFLAGS_BLOB    :=--format binary --oformat elf32-shbig-linux
 endif
 
 CFLAGS		+= -pipe $(cpu-y)
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 7ad7fb78a20c..6d94034e2820 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -23,8 +23,6 @@ AS              := $(AS) -32
 LDFLAGS		:= -m elf32_sparc
 endif
 
-LDFLAGS_BLOB	:= --format binary --oformat elf32-sparc
-
 #CFLAGS := $(CFLAGS) -g -pipe -fcall-used-g5 -fcall-used-g7
 ifneq ($(IS_EGCS),y)
 CFLAGS := $(CFLAGS) -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 5764acac8480..1becc32a4893 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -942,6 +942,15 @@ config DEBUG_DCFLUSH
 	bool "D-cache flush debugging"
 	depends on DEBUG_KERNEL
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 config STACK_DEBUG
 	bool "Stack Overflow Detection Support"
 
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile
index 7a365564c678..a48cd1850b44 100644
--- a/arch/sparc64/Makefile
+++ b/arch/sparc64/Makefile
@@ -32,7 +32,6 @@ RANLIB		= sparc64-linux-ranlib
 else
 AS		:= $(AS) -64
 LDFLAGS		:= -m elf64_sparc
-LDFLAGS_BLOB	:= --format binary --oformat elf64-sparc
 endif
 
 ifneq ($(UNDECLARED_REGS),y)
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 44dd2f0ff75e..3fe585966686 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -221,7 +221,7 @@ config DEBUG_SLAB
 config DEBUG_SPINLOCK
 	bool "Debug spinlocks usage"
 
-config DEBUGSYM
+config DEBUG_INFO
 	bool "Enable kernel debugging symbols"
 	help
         When this is enabled, the User-Mode Linux binary will include
@@ -234,15 +234,15 @@ config DEBUGSYM
 
 config FRAME_POINTER
 	bool
-	default y if DEBUGSYM
+	default y if DEBUG_INFO
 
 config PT_PROXY
 	bool "Enable ptrace proxy"
-	depends on XTERM_CHAN && DEBUGSYM
+	depends on XTERM_CHAN && DEBUG_INFO
 
 config GPROF
 	bool "Enable gprof support"
-	depends on DEBUGSYM
+	depends on DEBUG_INFO
 	help
         This allows profiling of a User-Mode Linux kernel with the gprof
         utility.
@@ -255,7 +255,7 @@ config GPROF
 
 config GCOV
 	bool "Enable gcov support"
-	depends on DEBUGSYM
+	depends on DEBUG_INFO
 	help
         This option allows developers to retrieve coverage data from a UML
         session.
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 6b116775f9c2..bb7d3f6baa95 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -13,12 +13,10 @@ OS := $(shell uname -s)
 # EXTRAVERSION...
 MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
 
-ifeq ($(CONFIG_DEBUGSYM),y)
+ifeq ($(CONFIG_DEBUG_INFO),y)
 CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS))
 endif
 
-CFLAGS-$(CONFIG_DEBUGSYM) += -g
-
 core-y			+= $(ARCH_DIR)/kernel/		 \
 			   $(ARCH_DIR)/drivers/          \
 			   $(ARCH_DIR)/sys-$(SUBARCH)/
diff --git a/arch/um/config.release b/arch/um/config.release
index 78eff5fbc635..82d3badeb28e 100644
--- a/arch/um/config.release
+++ b/arch/um/config.release
@@ -329,7 +329,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # Kernel hacking
 #
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUGSYM is not set
+# CONFIG_DEBUG_INFO is not set
 # CONFIG_PT_PROXY is not set
 # CONFIG_GPROF is not set
 # CONFIG_GCOV is not set
diff --git a/arch/um/defconfig b/arch/um/defconfig
index f212749e179a..3430e124adbf 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -399,7 +399,7 @@ CONFIG_MTD_BLKMTD=m
 #
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUGSYM=y
+CONFIG_DEBUG_INFO=y
 CONFIG_FRAME_POINTER=y
 CONFIG_PT_PROXY=y
 # CONFIG_GPROF is not set
diff --git a/arch/v850/Makefile b/arch/v850/Makefile
index f1d21d639998..6edaed4a310e 100644
--- a/arch/v850/Makefile
+++ b/arch/v850/Makefile
@@ -27,7 +27,6 @@ CFLAGS += -D__linux__ -DUTS_SYSNAME=\"uClinux\"
 # some reason)
 LDFLAGS_MODULE += --unique=.gnu.linkonce.this_module
 
-LDFLAGS_BLOB := -b binary --oformat elf32-little
 OBJCOPY_FLAGS_BLOB := -I binary -O elf32-little -B v850e
 
 
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index a5a9144d3dd5..53254d628ba8 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -540,6 +540,15 @@ config INIT_DEBUG
 	  Fill __init and __initdata at the end of boot. This helps debugging
 	  illegal uses of __init and __initdata after initialization.	  
 
+config DEBUG_INFO
+	bool "Compile the kernel with debug info"
+	depends on DEBUG_KERNEL
+	help
+          If you say Y here the resulting kernel image will include
+	  debugging info resulting in a larger kernel image.
+	  Say Y here only if you plan to use gdb to debug the kernel.
+	  If you don't debug the kernel, you can say N.
+	  
 config KALLSYMS
 	bool "Load all symbols for debugging/kksymoops"
 	help
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 35447c84d97c..2f6e40f2de70 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -36,7 +36,6 @@ export IA32_CC IA32_LD IA32_AS IA32_OBJCOPY IA32_CPP
 LDFLAGS		:= -m elf_x86_64
 OBJCOPYFLAGS	:= -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux := -e stext
-LDFLAGS_BLOB	:= --format binary --oformat elf64-x86-64
 
 CFLAGS += -mno-red-zone
 CFLAGS += -mcmodel=kernel
diff --git a/fs/Makefile b/fs/Makefile
index 7bf93d805a00..d355d29e84a8 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -12,15 +12,11 @@ obj-y :=	open.o read_write.o file_table.o buffer.o \
 		filesystems.o namespace.o seq_file.o xattr.o libfs.o \
 		fs-writeback.o mpage.o direct-io.o aio.o
 
-obj-$(CONFIG_EPOLL)	+= eventpoll.o
+obj-$(CONFIG_EPOLL)		+= eventpoll.o
+obj-$(CONFIG_COMPAT)		+= compat.o
 
-obj-$(CONFIG_COMPAT) += compat.o
-
-ifneq ($(CONFIG_NFSD),n)
-ifneq ($(CONFIG_NFSD),)
-obj-y += nfsctl.o
-endif
-endif
+nfsd-$(CONFIG_NFSD)		:= nfsctl.o
+obj-y				+= $(nfsd-y) $(nfsd-m)
 
 obj-$(CONFIG_BINFMT_AOUT)	+= binfmt_aout.o
 obj-$(CONFIG_BINFMT_EM86)	+= binfmt_em86.o
@@ -74,7 +70,7 @@ obj-$(CONFIG_LOCKD)		+= lockd/
 obj-$(CONFIG_NLS)		+= nls/
 obj-$(CONFIG_SYSV_FS)		+= sysv/
 obj-$(CONFIG_SMB_FS)		+= smbfs/
-obj-$(CONFIG_CIFS)             += cifs/
+obj-$(CONFIG_CIFS)		+= cifs/
 obj-$(CONFIG_NCP_FS)		+= ncpfs/
 obj-$(CONFIG_HPFS_FS)		+= hpfs/
 obj-$(CONFIG_NTFS_FS)		+= ntfs/
diff --git a/scripts/genksyms/lex.c_shipped b/scripts/genksyms/lex.c_shipped
index 33e7e9e2e521..d9bfbb5948f2 100644
--- a/scripts/genksyms/lex.c_shipped
+++ b/scripts/genksyms/lex.c_shipped
@@ -294,10 +294,10 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 #define YY_END_OF_BUFFER 14
 static yyconst short int yy_accept[76] =
     {   0,
-        0,    0,    0,    0,   14,   12,    4,    3,   12,   12,
-       12,    7,    7,   12,   12,   12,   12,   12,    9,    9,
-       12,   12,   12,    4,    0,    5,    0,    0,    6,    0,
-        0,    7,    0,    0,    0,    0,    2,    8,   10,   10,
+        0,    0,    0,    0,   14,   12,    4,    3,   12,    7,
+       12,   12,    7,   12,   12,   12,   12,   12,    9,    9,
+       12,   12,   12,    4,    0,    5,    0,    7,    0,    6,
+        0,    0,    0,    0,    0,    0,    2,    8,   10,   10,
         9,    0,    0,    9,    9,    0,    9,    0,    0,   11,
         0,    0,    0,   10,    0,   10,    9,    9,    0,    0,
         0,    0,    0,    0,    0,   10,   10,    0,    0,    0,
@@ -309,17 +309,17 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         4,    4,    4,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    5,    6,    1,    7,    8,    9,    1,
-        1,    7,   10,    1,   11,   12,    7,   13,   14,   14,
-       14,   14,   14,   14,   14,   15,   15,    1,    1,   16,
-       17,   18,    1,    1,   19,   19,   19,   19,   20,   21,
-       22,   22,   22,   22,   22,   23,   22,   22,   22,   22,
-       22,   22,   22,   22,   24,   22,   22,   25,   22,   22,
-        1,   26,    1,    7,   22,    1,   19,   19,   19,   19,
-
-       20,   21,   22,   22,   22,   22,   22,   27,   22,   22,
-       22,   22,   22,   22,   22,   22,   24,   22,   22,   25,
-       22,   22,    1,   28,    1,    7,    1,    1,    1,    1,
+        1,    2,    1,    5,    6,    7,    8,    9,   10,    1,
+        1,    8,   11,    1,   12,   13,    8,   14,   15,   15,
+       15,   15,   15,   15,   15,   16,   16,    1,    1,   17,
+       18,   19,    1,    1,   20,   20,   20,   20,   21,   22,
+        7,    7,    7,    7,    7,   23,    7,    7,    7,    7,
+        7,    7,    7,    7,   24,    7,    7,   25,    7,    7,
+        1,   26,    1,    8,    7,    1,   20,   20,   20,   20,
+
+       21,   22,    7,    7,    7,    7,    7,   27,    7,    7,
+        7,    7,    7,    7,    7,    7,   24,    7,    7,   25,
+        7,    7,    1,   28,    1,    8,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -338,111 +338,113 @@ static yyconst int yy_ec[256] =
 
 static yyconst int yy_meta[29] =
     {   0,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    3,
-        3,    4,    5,    5,    5,    1,    1,    1,    6,    7,
-        6,    8,    8,    8,    8,    1,    8,    1
+        1,    1,    2,    1,    1,    1,    3,    1,    1,    1,
+        4,    4,    5,    6,    6,    6,    1,    1,    1,    7,
+        8,    7,    3,    3,    3,    1,    3,    1
     } ;
 
 static yyconst short int yy_base[88] =
     {   0,
-        0,  166,   22,  152,  151,  282,   39,  282,   26,   33,
-      138,    0,   39,   43,  124,   39,   36,   48,   52,   55,
-       41,   56,   54,   47,   73,  282,    0,   72,  282,    0,
-      116,    0,   78,   75,  122,  103,  282,  282,  106,    0,
-       97,   73,   76,   91,   65,    0,    0,   84,   81,  282,
-      132,   98,   84,  282,  117,  147,  282,   73,  134,   89,
-      100,  140,  172,  139,  134,  181,  282,  135,  106,  142,
-      168,   88,   52,  282,  282,  208,  216,  220,  228,  236,
-      244,  249,  254,  255,  260,  265,  273
+        0,  147,   21,  140,  145,  284,   39,  284,   26,    0,
+       32,  126,   40,   44,  115,   35,   36,   46,   50,   53,
+       39,   61,   54,   79,   65,  284,    0,    0,   66,  284,
+        0,  119,   79,   75,  123,  104,  284,  284,  107,    0,
+       79,   73,   76,   76,   66,    0,    0,   85,   86,  284,
+      133,   83,   91,  284,   99,  147,  284,  114,  122,   70,
+      107,  141,  172,  151,  135,  181,  284,  137,  114,  157,
+      149,   48,   45,  284,  284,  208,  214,  222,  230,  238,
+      246,  250,  255,  256,  261,  267,  275
     } ;
 
 static yyconst short int yy_def[88] =
     {   0,
        75,    1,    1,    3,   75,   75,   75,   75,   76,   77,
-       75,   78,   78,   79,   75,   75,   75,   75,   75,   19,
-       75,   75,   75,   75,   76,   75,   80,   77,   75,   81,
-       75,   78,   76,   77,   79,   79,   75,   75,   75,   39,
-       19,   82,   83,   75,   75,   84,   20,   76,   77,   75,
+       78,   75,   77,   79,   75,   75,   75,   75,   75,   19,
+       75,   75,   75,   75,   76,   75,   80,   77,   78,   75,
+       81,   75,   76,   78,   79,   79,   75,   75,   75,   39,
+       19,   82,   83,   75,   75,   84,   20,   76,   78,   75,
        79,   51,   85,   75,   75,   75,   75,   84,   79,   51,
        79,   79,   79,   51,   75,   75,   75,   86,   79,   63,
        86,   87,   87,   75,    0,   75,   75,   75,   75,   75,
        75,   75,   75,   75,   75,   75,   75
     } ;
 
-static yyconst short int yy_nxt[311] =
+static yyconst short int yy_nxt[313] =
     {   0,
-        6,    7,    8,    7,    9,    6,    6,    6,   10,    6,
-        6,   11,    6,    6,    6,    6,    6,    6,   12,   12,
-       12,   12,   13,   12,   12,    6,   12,    6,   15,   16,
+        6,    7,    8,    7,    9,    6,   10,    6,    6,   11,
+        6,    6,   12,    6,    6,    6,    6,    6,    6,   10,
+       10,   10,   13,   10,   10,    6,   10,    6,   15,   16,
        26,   15,   17,   18,   19,   20,   20,   21,   15,   22,
-       24,   29,   24,   33,   36,   37,   38,   34,   24,   23,
-       24,   27,   38,   38,   74,   38,   38,   38,   30,   31,
-       39,   39,   39,   40,   41,   41,   42,   47,   47,   47,
-       38,   43,   38,   38,   44,   45,   46,   26,   44,   75,
-       29,   38,   26,   29,   40,   55,   55,   57,   26,   29,
-       74,   57,   43,   65,   65,   44,   45,   30,   27,   44,
-
-       30,   59,   37,   27,   36,   37,   30,   59,   37,   27,
-       64,   64,   64,   35,   57,   51,   52,   52,   39,   39,
-       39,   75,   35,   69,   37,   53,   54,   50,   54,   56,
-       56,   56,   54,   59,   37,   59,   37,   37,   68,   35,
-       38,   59,   37,   59,   60,   60,   66,   66,   66,   31,
-       75,   64,   64,   64,   61,   62,   63,   14,   61,   56,
-       56,   56,   69,   35,   61,   62,   69,   67,   61,   67,
-       37,   14,   72,   67,   37,   75,   75,   75,   75,   75,
-       75,   75,   75,   75,   70,   70,   70,   75,   75,   75,
-       70,   70,   70,   66,   66,   66,   75,   75,   75,   75,
-
-       75,   54,   75,   54,   75,   75,   75,   54,   25,   25,
-       25,   25,   25,   25,   25,   25,   28,   28,   28,   28,
-       28,   28,   28,   28,   32,   32,   32,   32,   35,   35,
-       35,   35,   35,   35,   35,   35,   48,   75,   48,   48,
-       48,   48,   48,   48,   49,   75,   49,   49,   49,   49,
-       49,   49,   42,   42,   75,   42,   56,   75,   56,   58,
-       58,   58,   66,   75,   66,   71,   71,   71,   71,   71,
-       71,   71,   71,   73,   73,   73,   73,   73,   73,   73,
-       73,    5,   75,   75,   75,   75,   75,   75,   75,   75,
+       24,   30,   24,   38,   33,   36,   37,   74,   23,   34,
+       74,   27,   38,   38,   38,   38,   38,   31,   32,   39,
+       39,   39,   40,   41,   41,   42,   47,   47,   47,   26,
+       43,   38,   44,   45,   46,   30,   44,   75,   38,   38,
+       24,   38,   24,   26,   30,   40,   55,   55,   57,   26,
+       27,   31,   57,   43,   35,   30,   64,   64,   64,   57,
+
+       31,   65,   65,   75,   27,   36,   37,   35,   59,   37,
+       27,   31,   56,   56,   56,   59,   37,   51,   52,   52,
+       39,   39,   39,   59,   37,   37,   68,   53,   54,   54,
+       69,   50,   38,   54,   59,   37,   44,   45,   32,   37,
+       44,   35,   59,   37,   75,   14,   60,   60,   66,   66,
+       66,   37,   14,   72,   75,   61,   62,   63,   59,   61,
+       56,   56,   56,   69,   64,   64,   64,   69,   67,   67,
+       75,   75,   75,   67,   37,   35,   75,   75,   75,   61,
+       62,   75,   75,   61,   75,   70,   70,   70,   75,   75,
+       75,   70,   70,   70,   66,   66,   66,   75,   75,   75,
+
+       75,   75,   54,   54,   75,   75,   75,   54,   25,   25,
+       25,   25,   25,   25,   25,   25,   28,   75,   75,   28,
+       28,   28,   29,   29,   29,   29,   29,   29,   29,   29,
+       35,   35,   35,   35,   35,   35,   35,   35,   48,   75,
+       48,   48,   48,   48,   48,   48,   49,   75,   49,   49,
+       49,   49,   49,   49,   42,   42,   75,   42,   56,   75,
+       56,   58,   58,   58,   66,   75,   66,   71,   71,   71,
+       71,   71,   71,   71,   71,   73,   73,   73,   73,   73,
+       73,   73,   73,    5,   75,   75,   75,   75,   75,   75,
        75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
 
-       75,   75,   75,   75,   75,   75,   75,   75,   75,   75
+       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
+       75,   75
     } ;
 
-static yyconst short int yy_chk[311] =
+static yyconst short int yy_chk[313] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    3,    3,
         9,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        7,   10,    7,   13,   14,   14,   16,   13,   24,    3,
-       24,    9,   17,   17,   73,   16,   21,   21,   10,   18,
-       18,   18,   18,   19,   19,   19,   19,   20,   20,   20,
-       23,   19,   22,   22,   19,   19,   19,   25,   19,   20,
-       28,   23,   33,   34,   42,   43,   43,   45,   48,   49,
-       72,   45,   42,   53,   53,   58,   58,   28,   25,   58,
-
-       34,   61,   61,   33,   36,   36,   49,   69,   69,   48,
-       52,   52,   52,   60,   44,   36,   36,   36,   39,   39,
-       39,   41,   52,   61,   35,   39,   39,   31,   39,   55,
-       55,   55,   39,   51,   51,   59,   59,   68,   59,   68,
-       15,   62,   62,   70,   51,   51,   65,   65,   65,   11,
-        5,   64,   64,   64,   51,   51,   51,    4,   51,   56,
-       56,   56,   62,   64,   70,   70,   62,   56,   70,   56,
-       71,    2,   71,   56,   63,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   63,   63,   63,    0,    0,    0,
-       63,   63,   63,   66,   66,   66,    0,    0,    0,    0,
-
-        0,   66,    0,   66,    0,    0,    0,   66,   76,   76,
-       76,   76,   76,   76,   76,   76,   77,   77,   77,   77,
-       77,   77,   77,   77,   78,   78,   78,   78,   79,   79,
-       79,   79,   79,   79,   79,   79,   80,    0,   80,   80,
-       80,   80,   80,   80,   81,    0,   81,   81,   81,   81,
-       81,   81,   82,   82,    0,   82,   83,    0,   83,   84,
-       84,   84,   85,    0,   85,   86,   86,   86,   86,   86,
-       86,   86,   86,   87,   87,   87,   87,   87,   87,   87,
-       87,   75,   75,   75,   75,   75,   75,   75,   75,   75,
+        7,   11,    7,   16,   13,   14,   14,   73,    3,   13,
+       72,    9,   16,   17,   17,   21,   21,   11,   18,   18,
+       18,   18,   19,   19,   19,   19,   20,   20,   20,   25,
+       19,   23,   19,   19,   19,   29,   19,   20,   22,   22,
+       24,   23,   24,   33,   34,   42,   43,   43,   45,   48,
+       25,   29,   45,   42,   60,   49,   52,   52,   52,   44,
+
+       34,   53,   53,   41,   33,   36,   36,   52,   61,   61,
+       48,   49,   55,   55,   55,   69,   69,   36,   36,   36,
+       39,   39,   39,   59,   59,   35,   59,   39,   39,   39,
+       61,   32,   15,   39,   51,   51,   58,   58,   12,   68,
+       58,   68,   62,   62,    5,    4,   51,   51,   65,   65,
+       65,   71,    2,   71,    0,   51,   51,   51,   70,   51,
+       56,   56,   56,   62,   64,   64,   64,   62,   56,   56,
+        0,    0,    0,   56,   63,   64,    0,    0,    0,   70,
+       70,    0,    0,   70,    0,   63,   63,   63,    0,    0,
+        0,   63,   63,   63,   66,   66,   66,    0,    0,    0,
+
+        0,    0,   66,   66,    0,    0,    0,   66,   76,   76,
+       76,   76,   76,   76,   76,   76,   77,    0,    0,   77,
+       77,   77,   78,   78,   78,   78,   78,   78,   78,   78,
+       79,   79,   79,   79,   79,   79,   79,   79,   80,    0,
+       80,   80,   80,   80,   80,   80,   81,    0,   81,   81,
+       81,   81,   81,   81,   82,   82,    0,   82,   83,    0,
+       83,   84,   84,   84,   85,    0,   85,   86,   86,   86,
+       86,   86,   86,   86,   86,   87,   87,   87,   87,   87,
+       87,   87,   87,   75,   75,   75,   75,   75,   75,   75,
        75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
 
-       75,   75,   75,   75,   75,   75,   75,   75,   75,   75
+       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
+       75,   75
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -507,7 +509,7 @@ char *yytext;
 #define V2_TOKENS 1
 
 /* We don't do multiple input files.  */
-#line 511 "scripts/genksyms/lex.c"
+#line 513 "scripts/genksyms/lex.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -666,7 +668,7 @@ YY_DECL
 
 
  /* Keep track of our location in the original source files.  */
-#line 670 "scripts/genksyms/lex.c"
+#line 672 "scripts/genksyms/lex.c"
 
 	if ( yy_init )
 		{
@@ -724,7 +726,7 @@ yy_match:
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 282 );
+		while ( yy_base[yy_current_state] != 284 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -836,7 +838,7 @@ YY_RULE_SETUP
 #line 95 "scripts/genksyms/lex.l"
 ECHO;
 	YY_BREAK
-#line 840 "scripts/genksyms/lex.c"
+#line 842 "scripts/genksyms/lex.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(V2_TOKENS):
 	yyterminate();
diff --git a/scripts/genksyms/lex.l b/scripts/genksyms/lex.l
index a3aeb92cf91f..fe0dfeedf0ff 100644
--- a/scripts/genksyms/lex.l
+++ b/scripts/genksyms/lex.l
@@ -37,7 +37,7 @@
 
 %}
 
-IDENT			[A-Za-z_][A-Za-z0-9_]*
+IDENT			[A-Za-z_\$][A-Za-z0-9_\$]*
 
 O_INT			0[0-7]*
 D_INT			[1-9][0-9]*
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 4d72008b8979..6f11a7d44000 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -408,6 +408,7 @@ int conf_write(const char *name)
 	if (out_h) {
 		fclose(out_h);
 		rename(".tmpconfig.h", "include/linux/autoconf.h");
+		file_write_dep(NULL);
 	}
 	if (!name || basename != conf_def_filename) {
 		if (!name)
diff --git a/scripts/makeman b/scripts/makeman
new file mode 100644
index 000000000000..3c6dc5b89f21
--- /dev/null
+++ b/scripts/makeman
@@ -0,0 +1,46 @@
+#!/usr/bin/perl
+
+use strict;
+
+## Copyright (C) Michael Still (mikal@stillhq.com)
+## Released under the terms of the GNU GPL
+##
+## A script to make or install the manpages extracted by split-man
+##
+## Arguements: $1 -- the word "convert" or "install"
+##             $2 -- the directory containing the SGML files for the manpages
+##             $3 -- the filename which contained the sgmldoc output
+##                     (I need this so I know which manpages to convert)
+
+my($LISTING);
+
+if($ARGV[0] eq ""){
+  die "Usage: makeman [convert | install] <dir> <file>\n";
+}
+
+if( ! -d "$ARGV[1]" ){
+  die "Output directory \"$ARGV[1]\" does not exist\n";
+}
+
+if($ARGV[0] eq "convert"){
+  open LISTING, "grep \"<refentrytitle>\" $ARGV[2] |";
+  while(<LISTING>){
+    s/<\/.*$//;
+    s/^.*>//;
+    s/\.sgml//;
+    s/struct //;
+    s/typedef //;
+
+    chomp;
+    print "Processing $_\n";
+    system("cd $ARGV[1]; docbook2man $_.sgml; gzip -f $_.9\n");
+  }
+}
+elsif($ARGV[0] eq "install"){
+  system("mkdir -p /usr/local/man/man9/; install $ARGV[1]/*.9.gz /usr/local/man/man9/");
+}
+else{
+  die "Usage: makeman [convert | install] <dir> <file>\n";
+}
+
+print "Done\n";
diff --git a/scripts/split-man b/scripts/split-man
new file mode 100644
index 000000000000..bff727ba2476
--- /dev/null
+++ b/scripts/split-man
@@ -0,0 +1,112 @@
+#!/usr/bin/perl
+
+use strict;
+
+## Copyright (C) Michael Still (mikal@stillhq.com)
+## Released under the terms of the GNU GPL
+##
+## Hoon through the specified DocBook SGML file, and split out the
+## man pages. These can then be processed into groff format, and
+## installed if desired...
+##
+## Arguements: $1 -- the name of the sgml file
+##             $2 -- the directory to put the generated SGML files in
+##             $3 -- kernel version
+
+my($SGML, $REF, $front, $refdata, $mode, $filename);
+
+if(($ARGV[0] eq "") || ($ARGV[1] eq "") || ($ARGV[2] eq "")){
+  die "Usage: split-man <sgml file> <output dir> <kernel version>\n";
+}
+
+open SGML, "< $ARGV[0]" or die "Could not open input file \"$ARGV[0]\"\n";
+if( ! -d "$ARGV[1]" ){
+  die "Output directory \"$ARGV[1]\" does not exist\n";
+}
+
+# Possible modes:
+#   0: Looking for input I care about
+#   1: Inside book front matter
+#   2: Inside a refentry
+#   3: Inside a refentry, and we know the filename
+
+$mode = 0;
+$refdata = "";
+$front = "";
+while(<SGML>){
+  # Starting modes
+  if(/<legalnotice>/){
+    $mode = 1;
+  }
+  elsif(/<refentry>/){
+    $mode = 2;
+  }
+  elsif(/<refentrytitle><phrase[^>]*>([^<]*)<.*$/){
+    $mode = 3;
+    $filename = $1;
+
+    $filename =~ s/struct //;
+    $filename =~ s/typedef //;
+
+    print "Found manpage for $filename\n";
+    open REF, "> $ARGV[1]/$filename.sgml" or
+      die "Couldn't open output file \"$ARGV[1]/$filename.sgml\": $!\n";
+    print REF "<!DOCTYPE refentry PUBLIC \"-//Davenport//DTD DocBook V3.0//EN\">\n\n";
+    print REF "$refdata";
+    $refdata = "";
+  }
+
+  # Extraction
+  if($mode == 1){
+    $front = "$front$_";
+  }
+  elsif($mode == 2){
+    $refdata = "$refdata$_";
+  }
+  elsif($mode == 3){
+    # There are some fixups which need to be applied
+    if(/<\/refmeta>/){
+      print REF "<manvolnum>9</manvolnum>\n";
+    }
+    if(/<\/refentry>/){
+      $front =~ s/<legalnotice>//;
+      $front =~ s/<\/legalnotice>//;
+      print REF <<EOF;
+<refsect1><title>About this document</title>
+$front
+<para>
+If you have comments on the formatting of this manpage, then please contact
+Michael Still (mikal\@stillhq.com).
+</para>
+
+<para>
+This documentation was generated with kernel version $ARGV[2].
+</para>
+</refsect1>
+EOF
+    }
+
+    # For some reason, we title the synopsis twice in the main DocBook
+    if(! /<title>Synopsis<\/title>/){
+      if(/<refentrytitle>/){
+	s/struct //;
+	s/typedef //;
+      }
+
+      print REF "$_";
+    }
+  }
+
+  # Ending modes
+  if(/<\/legalnotice>/){
+    $mode = 0;
+  }
+  elsif(/<\/refentry>/){
+    $mode = 0;
+    close REF;
+  }
+}
+
+# And make sure we don't process this unnessesarily
+$ARGV[0] =~ s/\.sgml/.9/;
+`touch $ARGV[0]`;
diff --git a/usr/Makefile b/usr/Makefile
index 58a915ee7fe5..fe62659ff483 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -5,11 +5,10 @@ host-progs  := gen_init_cpio
 
 clean-files := initramfs_data.cpio.gz
 
-LDFLAGS_initramfs_data.o := $(LDFLAGS_BLOB) -r -T
-
-$(obj)/initramfs_data.o: $(src)/initramfs_data.scr \
-			 $(obj)/initramfs_data.cpio.gz FORCE
-	$(call if_changed,ld)
+# initramfs_data.o contains the initramfs_data.cpio.gz image.
+# The image is included using .incbin, a dependency which is not
+# tracked automatically.
+$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE
 
 # initramfs-y are the programs which will be copied into the CPIO
 # archive. Currently, the filenames are hardcoded in gen_init_cpio,
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S
new file mode 100644
index 000000000000..c2e1ad424f4a
--- /dev/null
+++ b/usr/initramfs_data.S
@@ -0,0 +1,30 @@
+/*
+  initramfs_data includes the compressed binary that is the
+  filesystem used for early user space.
+  Note: Older versions of "as" (prior to binutils 2.11.90.0.23
+  released on 2001-07-14) dit not support .incbin.
+  If you are forced to use older binutils than that then the
+  following trick can be applied to create the resulting binary:
+
+
+  ld -m elf_i386  --format binary --oformat elf32-i386 -r \
+  -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
+   ld -m elf_i386  -r -o built-in.o initramfs_data.o
+
+  initramfs_data.scr looks like this:
+SECTIONS
+{
+       .init.ramfs : { *(.data) }
+}
+
+  The above example is for i386 - the parameters vary from architectures.
+  Eventually look up LDFLAGS_BLOB in an older version of the
+  arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
+
+  Using .incbin has the advantage over ld that the correct flags are set
+  in the ELF header, as required by certain architectures.
+*/
+
+.section .init.ramfs,"a"
+.incbin "usr/initramfs_data.cpio.gz"
+
diff --git a/usr/initramfs_data.scr b/usr/initramfs_data.scr
deleted file mode 100644
index bf6d172329e0..000000000000
--- a/usr/initramfs_data.scr
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTIONS
-{
-	.init.ramfs : { *(.data) }
-}