[PATCH] Documentation/Changes for modules

the url for module-init-tools has been fixed, and all the references to
modutils (outside source) has been updated if necessary.

more patches to follow to fix up the modules.conf/conf.modules vs.
modprobe.conf references.

9 files changed, 30 insertions, 33 deletions

diff --git a/Documentation/Changes b/Documentation/Changes
index a57fca2015c2..8df1075acfe8 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -52,7 +52,7 @@ o  Gnu C                  2.95.3                  # gcc --version
 o  Gnu make               3.78                    # make --version
 o  binutils               2.9.5.0.25              # ld -v
 o  util-linux             2.10o                   # fdformat --version
-o  modutils               2.4.2                   # insmod -V
+o  module-init-tools      0.9                     # rmmod -V
 o  e2fsprogs              1.29                    # tune2fs
 o  jfsutils               1.0.14                  # fsck.jfs -V
 o  reiserfsprogs          3.6.3                   # reiserfsck -V 2>&1|grep reiserfsprogs
@@ -141,14 +141,11 @@ If the unthinkable happens and your kernel oopses, you'll need a 2.4
 version of ksymoops to decode the report; see REPORTING-BUGS in the
 root of the Linux source for more information.
 
-Modutils
+Module-Init-Tools
 --------
 
-Upgrade to recent modutils to fix various outstanding bugs which are
-seen more frequently under 2.4.x, and to enable auto-loading of USB
-modules.  In addition, the layout of modules under
-/lib/modules/`uname -r`/ has been made more sane.  This change also
-requires that you upgrade to a recent modutils.
+A new module loader is now in the kernel that requires module-init-tools
+to use.  It is backward compatible with the 2.4.x series kernels.
 
 Mkinitrd
 --------
@@ -306,7 +303,7 @@ o  <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>
 
 Modutils
 --------
-o  <ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/>
+o  <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>
 
 Mkinitrd
 --------
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 12b0086b75ea..b3c00ed92451 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -213,7 +213,7 @@ The top Makefile exports the following variables:
 
 	$(GENKSYMS) contains the command used to generate kernel symbol
 	signatures when CONFIG_MODVERSIONS is enabled.	The genksyms
-	command comes from the modutils package.
+	command comes from the module-init-tools package.
 
     CROSS_COMPILE
 
diff --git a/Documentation/modules.txt b/Documentation/modules.txt
index 833a05804052..e30516d41121 100644
--- a/Documentation/modules.txt
+++ b/Documentation/modules.txt
@@ -3,12 +3,11 @@ in the Linux kernel. This is not a technical description on
 the internals of module, but mostly a sample of how to compile
 and use modules.
 
-Note: You should ensure that the modutils-X.Y.Z.tar.gz you are using
-is the most up to date one for this kernel. The "X.Y.Z" will reflect
-the kernel version at the time of the release of the modules package.
-Some older modules packages aren't aware of some of the newer modular
-features that the kernel now supports.  The current required version
-is listed in the file linux/Documentation/Changes.
+Note: You should ensure that the module-init-tools-X.Y.Z.tar.gz you
+are using is the most up to date one for this kernel.  Some older
+modules packages aren't aware of some of the newer modular features
+that the kernel now supports.  The current required version is listed
+in the file linux/Documentation/Changes.
 
 * * * NOTE * * *
 The kernel has been changed to remove kerneld support and use
@@ -124,7 +123,8 @@ And, yes, there _are_ man-pages for all this...
 
 To use modprobe successfully, you generally place the following
 command in your /etc/rc.d/rc.S script.  (Read more about this in the
-"rc.hints" file in the module utilities package, "modutils-x.y.z.tar.gz".)
+"rc.hints" file in the module utilities package,
+"module-init-tools-x.y.z.tar.gz".)
 
 	/sbin/depmod -a
 
diff --git a/Documentation/networking/z8530drv.txt b/Documentation/networking/z8530drv.txt
index 60f453d18f89..2206abbc3e1b 100644
--- a/Documentation/networking/z8530drv.txt
+++ b/Documentation/networking/z8530drv.txt
@@ -54,7 +54,7 @@ Before you can use a module, you'll have to load it with
 
 	insmod scc.o
 
-please read 'man insmod' that comes with modutils.
+please read 'man insmod' that comes with module-init-tools.
 
 You should include the insmod in one of the /etc/rc.d/rc.* files,
 and don't forget to insert a call of sccinit after that. It
diff --git a/Documentation/sound/oss/Introduction b/Documentation/sound/oss/Introduction
index 0b7fdc9593a4..90b41f8c3b4c 100644
--- a/Documentation/sound/oss/Introduction
+++ b/Documentation/sound/oss/Introduction
@@ -119,9 +119,9 @@ the README takes precedence.
 
 6.  Make the modules and install them (make modules; make modules_install).
 
-Note, for 2.4.x kernels, make sure you have the newer modutils 
-loaded or modules will not be loaded properly.  2.4.x changed the 
-layout of /lib/modules/2.4.x and requires an updated modutils.
+Note, for 2.5.x kernels, make sure you have the newer module-init-tools 
+installed or modules will not be loaded properly.  2.5.x requires an
+updated module-init-tools.
 
 
 Plug and Play (PnP:
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index ac873ad4ce6e..424ccd9f7c45 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -286,9 +286,9 @@ can be ORed together:
 
   1 - A module with a non-GPL license has been loaded, this
       includes modules with no license.
-      Set by modutils >= 2.4.9.
+      Set by modutils >= 2.4.9 and module-init-tools.
   2 - A module was force loaded by insmod -f.
-      Set by modutils >= 2.4.9.
+      Set by modutils >= 2.4.9 and module-init-tools.
   4 - Unsafe SMP processors: SMP with CPUs not designed for SMP.
 
 ==============================================================
diff --git a/Documentation/usb/hotplug.txt b/Documentation/usb/hotplug.txt
index 9e3b8fe50405..62d5860f324e 100644
--- a/Documentation/usb/hotplug.txt
+++ b/Documentation/usb/hotplug.txt
@@ -5,8 +5,8 @@ into the bus with power on.  In most cases, users expect the devices to become
 immediately usable.  That means the system must do many things, including:
 
     - Find a driver that can handle the device.  That may involve
-      loading a kernel module; newer drivers can use modutils to
-      publish their device (and class) support to user utilities.
+      loading a kernel module; newer drivers can use module-init-tools
+      to publish their device (and class) support to user utilities.
 
     - Bind a driver to that device.  Bus frameworks do that using a
       device driver's probe() routine.
@@ -76,15 +76,15 @@ user mode daemon to detect changes in system configuration.
 
 Currently available policy agent implementations can load drivers for
 modules, and can invoke driver-specific setup scripts.  The newest ones
-leverage USB modutils support.  Later agents might unload drivers.
+leverage USB module-init-tools support.  Later agents might unload drivers.
 
 
 USB MODUTILS SUPPORT
 
-Current versions of modutils will create a "modules.usbmap" file which
-contains the entries from each driver's MODULE_DEVICE_TABLE.  Such files
-can be used by various user mode policy agents to make sure all the right
-driver modules get loaded, either at boot time or later. 
+Current versions of module-init-tools will create a "modules.usbmap" file
+which contains the entries from each driver's MODULE_DEVICE_TABLE.  Such
+files can be used by various user mode policy agents to make sure all the
+right driver modules get loaded, either at boot time or later. 
 
 See <linux/usb.h> for full information about such table entries; or look
 at existing drivers.  Each table entry describes one or more criteria to
diff --git a/Documentation/video4linux/README.cpia b/Documentation/video4linux/README.cpia
index 521ef795a647..c95e7bbc0fdf 100644
--- a/Documentation/video4linux/README.cpia
+++ b/Documentation/video4linux/README.cpia
@@ -51,9 +51,9 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
 
-For autoloading of all those modules you need to tell modutils some
-stuff. Add the following line to your modutils config-file
-(e.g. /etc/modules.conf or wherever your distribution does store that
+For autoloading of all those modules you need to tell module-init-tools
+some stuff. Add the following line to your module-init-tools config-file
+(e.g. /etc/modprobe.conf or wherever your distribution does store that
 stuff):
 
 options parport_pc io=0x378 irq=7 dma=3
diff --git a/scripts/ver_linux b/scripts/ver_linux
index edc3ec1f26a4..9fe09a9c7f94 100644
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -28,7 +28,7 @@ fdformat --version | awk -F\- '{print "util-linux            ", $NF}'
 
 mount --version | awk -F\- '{print "mount                 ", $NF}'
 
-insmod -V  2>&1 | awk 'NR==1 {print "modutils              ",$NF}'
+rmmod -V  2>&1 | awk 'NR==1 {print "module-init-tools     ",$NF}'
 
 tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' |  awk \
 'NR==1 {print "e2fsprogs             ", $2}'