Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not

-Werror clean.

4 files changed, 42 insertions, 107 deletions

diff --git a/Documentation/filesystems/devfs/ChangeLog b/Documentation/filesystems/devfs/ChangeLog
index 4d7ccfcb5..908c24784 100644
--- a/Documentation/filesystems/devfs/ChangeLog
+++ b/Documentation/filesystems/devfs/ChangeLog
@@ -1592,3 +1592,24 @@ Changes for patch v174
 Work sponsored by SGI
 
 - Updated README from master HTML file
+===============================================================================
+Changes for patch v175
+
+Work sponsored by SGI
+
+- DocBook update for fs/devfs/base.c
+  Thanks to Tim Waugh <twaugh@redhat.com>
+
+- Removed stale fs/tunnel.c (was never used or completed)
+===============================================================================
+Changes for patch v176
+
+Work sponsored by SGI
+
+- Updated ToDo list
+
+- Removed sample modules.conf: now distributed with devfsd
+
+- Updated README from master HTML file
+
+- Ported to kernel 2.4.0-test3-pre4 (which had devfs-patch-v174)
diff --git a/Documentation/filesystems/devfs/README b/Documentation/filesystems/devfs/README
index bb3e47e92..6febda525 100644
--- a/Documentation/filesystems/devfs/README
+++ b/Documentation/filesystems/devfs/README
@@ -3,7 +3,7 @@ Devfs (Device File System) FAQ
 
 Linux Devfs (Device File System) FAQ
 Richard Gooch
-25-JUN-2000
+3-JUL-2000
 
 -----------------------------------------------------------------------------
 
@@ -899,20 +899,19 @@ Note that newer versions of init create /dev/initctl
 automatically, so you don't have to worry about this.
 
 Module autoloading
-Another thing to note is that if you want to support module
-autoloading then you need to edit your /etc/modules.conf so
-that things work properly. You should include the sample
-modules.conf file in the
-Documentation/filesystems/devfs directory into your
-/etc/modules.conf to ensure correct operation.
-
-You will also need to configure devfsd to enable module
+You will need to configure devfsd to enable module
 autoloading. The following lines should be placed in your
-/etc/devfsd.conf:
+/etc/devfsd.conf file:
 
 LOOKUP	.*		MODLOAD
 
 
+As of devfsd-v1.3.10, a generic /etc/modules.devfs
+configuration file is installed, which is used by the MODLOAD
+action. This should be sufficient for most configurations. If you
+require further configuration, edit your /etc/modules.conf
+file.
+
 Mounting root off a devfs device
 If you wish to mount root off a devfs device when you pass the
 "devfs=only" boot option, then you need to pass in the "root="
@@ -924,7 +923,7 @@ append = "root=<device>"
 Surprised? Yep, so was I. It turns out if you have (as most people
 do):
 
-root = 
+root = <device>
 
 
 then LILO will determine the device number of  and will write
@@ -1540,8 +1539,17 @@ discusses the scsihosts= boot option
 
 Douglas Gilbert has written yet another useful document at
 
-http://www.torque.net/scsi/linux_scsi_24 which
+http://www.torque.net/scsi/linux_scsi_24/ which
 discusses the Linux SCSI subsystem in 2.4.
 
 
+Johannes Erdfelt has started a discussion paper on Linux and
+hot-swap devices, describing what the requirements are for a scalable
+solution and how and why he's used devfs+devfsd. Note that this is an
+early draft only, available in plain text form at:
+
+http://johannes.erdfelt.com/hotswap.txt.
+Johannes has promised a HTML version will follow.
+
+
 
diff --git a/Documentation/filesystems/devfs/ToDo b/Documentation/filesystems/devfs/ToDo
index 3e1621bc1..c2cb38b70 100644
--- a/Documentation/filesystems/devfs/ToDo
+++ b/Documentation/filesystems/devfs/ToDo
@@ -2,7 +2,7 @@
 
 		Richard Gooch <rgooch@atnf.csiro.au>
 
-			      18-FEB-2000
+			      3-JUL-2000
 
 This is a list of things to be done for better devfs support in the
 Linux kernel. If you'd like to contribute to the devfs, please have a
@@ -18,8 +18,6 @@ list (preferably with your name attached to them:-).
 
 - Atari floppy driver (drivers/block/ataflop.c)
 
-- Network block device (drivers/block/nbd.c)
-
 - SWIM3 (Super Woz Integrated Machine 3) floppy driver (drivers/block/swim3.c)
 
 - Amiga ZorroII ramdisc driver (drivers/block/z2ram.c)
diff --git a/Documentation/filesystems/devfs/modules.conf b/Documentation/filesystems/devfs/modules.conf
deleted file mode 100644
index a91c99651..000000000
--- a/Documentation/filesystems/devfs/modules.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-# Sample entries for /etc/modules.conf for devfs
-
-###############################################################################
-#                  Configuration section: change to suit your hardware
-#
-alias		/dev/sound	sb
-alias		/dev/v4l	bttv
-alias		gen-watchdog	pcwd
-alias		gen-md		raid0
-alias		/dev/joysticks	joystick
-probeall	scsi-hosts	sym53c8xx
-
-###############################################################################
-#                      Generic section: do not change
-#
-# All HDDs
-probeall	/dev/discs	scsi-hosts sd_mod ide-probe-mod ide-disk DAC960
-
-# All CD-ROMs
-probeall	/dev/cdroms	scsi-hosts sr_mod ide-probe-mod ide-cd
-
-# All tapes
-probeall	/dev/tapes	scsi-hosts st ide-probe-mod ide-tape
-
-# All SCSI devices
-probeall	/dev/scsi	scsi-hosts sd_mod sr_mod st sg
-
-# All IDE devices
-probeall	/dev/ide	ide-probe-mod ide-disk ide-cd ide-tape ide-floppy
-
-# SCSI HDDs
-probeall	/dev/sd		scsi-hosts sd_mod
-alias		/dev/sd*	/dev/sd
-
-# SCSI CD-ROMs
-probeall	/dev/sr		scsi-hosts sr_mod
-alias		/dev/sr*	/dev/sr
-
-# SCSI tapes
-probeall	/dev/st		scsi-hosts st
-alias		/dev/st*	/dev/st
-alias		/dev/nst*	/dev/st
-
-# SCSI generic
-probeall	/dev/sg		scsi-hosts sg
-alias		/dev/sg*	/dev/sg
-
-# Floppies
-alias		/dev/floppy	floppy
-alias		/dev/fd*	floppy
-
-# RAMDISCs
-alias		/dev/rd		rd
-alias		/dev/ram*	rd
-
-# Loop devices
-alias		/dev/loop*	loop
-
-# Meta devices
-alias		/dev/md*	gen-md
-
-# Parallel port printers
-alias		/dev/printers	lp
-alias		/dev/lp*	lp
-
-# Soundcard
-alias		/dev/audio	/dev/sound
-alias		/dev/mixer	/dev/sound
-alias		/dev/dsp	/dev/sound
-alias		/dev/dspW	/dev/sound
-alias		/dev/midi	/dev/sound
-
-# Joysticks
-alias		/dev/js*	/dev/joysticks
-
-# Serial ports
-alias		/dev/tts	serial
-alias		/dev/ttyS*	/dev/tts
-alias		/dev/cua*	/dev/tts
-
-# Miscellaneous devices
-alias		/dev/watchdog	gen-watchdog # alias for gen-watchdog needed!
-alias		/dev/atibm	atixlmouse
-alias		/dev/inportbm	msbusmouse
-alias		/dev/logibm	busmouse
-
-# PPP devices
-alias		/dev/ppp*	ppp_generic
-
-# Video capture devices
-alias		/dev/video*	/dev/v4l
-alias		/dev/vbi*	/dev/v4l