Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.

The IP22 cache bugs which are plaguing some machines are still unfixed.

7 files changed, 86 insertions, 61 deletions

diff --git a/Documentation/Changes b/Documentation/Changes
index 525932df1..f8b055d21 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -317,12 +317,12 @@ o  ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/testing/isdn4k-
 
 Netfilter
 ---------
-o  http://netfilter.filewatcher.org/iptables-1.1.0.tar.bz2
-     <http://netfilter.filewatcher.org/iptables-1.1.0.tar.bz2>
-o  http://www.samba.org/netfilter/iptables-1.1.0.tar.bz2
-     <http://www.samba.org/netfilter/iptables-1.1.0.tar.bz2>
-o  http://netfilter.kernelnotes.org/iptables-1.1.0.tar.bz2
-     <http://netfilter.kernelnotes.org/iptables-1.1.0.tar.bz2>
+o  http://netfilter.filewatcher.org/iptables-1.1.1.tar.bz2
+     <http://netfilter.filewatcher.org/iptables-1.1.1.tar.bz2>
+o  http://www.samba.org/netfilter/iptables-1.1.1.tar.bz2
+     <http://www.samba.org/netfilter/iptables-1.1.1.tar.bz2>
+o  http://netfilter.kernelnotes.org/iptables-1.1.1.tar.bz2
+     <http://netfilter.kernelnotes.org/iptables-1.1.1.tar.bz2>
 
 Ip-route2
 ---------
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 8e10720f9..8a1b4ad9b 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -15126,16 +15126,10 @@ CONFIG_6xx
   There are four types of PowerPC chips supported. The more common
   types (601, 603, 604, 740, 750), the Motorola embedded versions
   (821, 823, 850, 855, 860), the IBM embedded versions (403 and
-  405) and the high end 64 bit Power processors (Power 3, Power 4). 
-  Unless you are building a kernel for one of the embedded 
-  processor systems, or a 64 bit IBM RS/6000, choose 6xx.
-
-CONFIG_PPC64BRIDGE
-  Currently there is not a 64 bit PowerPC Linux kernel. As a result
-  if you choose the CONFIG_POWER3 or CONFIG_POWER4 options you 
-  must choose this option as well. This enables gcc to emit
-  both 32 and 64 bit instructions as well as cause your kernel
-  to be built as a 32 bit kernel.
+  405) and the high end 64 bit Power processors (Power 3, Power 4).
+  Unless you are building a kernel for one of the embedded
+  processor systems, or a 64 bit IBM RS/6000, choose 6xx.  Note that
+  the kernel runs in 32-bit mode even on 64-bit chips.
 
 Machine Type
 CONFIG_PMAC
diff --git a/Documentation/DocBook/parportbook.tmpl b/Documentation/DocBook/parportbook.tmpl
index 754f1a96b..ef8c07d33 100644
--- a/Documentation/DocBook/parportbook.tmpl
+++ b/Documentation/DocBook/parportbook.tmpl
@@ -386,7 +386,7 @@
     announces it.  The <function>parport_announce_port</function>
     function walks down the list of parallel port device drivers
     (<structname>struct parport_driver</structname>s) calling the
-    <function>attach</function> function of each.
+    <function>attach</function> function of each (which may block).
    </para>
 
    <para>
@@ -394,7 +394,7 @@
     registering a port with the
     <function>parport_unregister_port</function> function, and device
     drivers are notified using the <function>detach</function>
-    callback.
+    callback (which may not block).
    </para>
 
    <para>
@@ -656,9 +656,31 @@ struct parport_driver {
    to the <function>attach</function> function when it is called, or
    alternatively can be found from the list of detected parallel ports
    directly with the (now deprecated)
-   <function>parport_enumerate</function> function.
+   <function>parport_enumerate</function> function.  A better way of
+   doing this is with <function>parport_find_number</function> or
+   <function>parport_find_base</function> functions, which find ports
+   by number and by base I/O address respectively.
   </para>
 
+  <funcsynopsis>
+   <funcsynopsisinfo>
+#include &lt;parport.h&gt;
+   </funcsynopsisinfo>
+   <funcprototype>
+    <funcdef>struct parport *<function>parport_find_number</function></funcdef>
+    <paramdef>int <parameter>number</parameter></paramdef>
+   </funcprototype>
+  </funcsynopsis>
+  <funcsynopsis>
+   <funcsynopsisinfo>
+#include &lt;parport.h&gt;
+   </funcsynopsisinfo>
+   <funcprototype>
+    <funcdef>struct parport *<function>parport_find_base</function></funcdef>
+    <paramdef>unsigned long <parameter>base</parameter></paramdef>
+   </funcprototype>
+  </funcsynopsis>
+
   <para>
    The next three parameters, <parameter>pf</parameter>,
    <parameter>kf</parameter>, and <parameter>irq_func</parameter>, are
@@ -2202,6 +2224,9 @@ ssize_t write_printer (int fd, const void *ptr, size_t count)
 !Fdrivers/parport/daisy.c parport_find_class
 !Fdrivers/parport/share.c parport_register_driver
 !Fdrivers/parport/share.c parport_unregister_driver
+!Fdrivers/parport/share.c parport_get_port
+!Fdrivers/parport/share.c parport_put_port
+!Fdrivers/parport/share.c parport_find_number parport_find_base
 !Fdrivers/parport/share.c parport_register_device
 !Fdrivers/parport/share.c parport_unregister_device
 !Fdrivers/parport/daisy.c parport_open
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 0dd2cc8eb..421b17318 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -66,6 +66,7 @@ getattr:						(see below)
 revalidate:	no					(see below)
 	Additionally, ->rmdir() has i_zombie on victim and so does ->rename()
 in case when target exists and is a directory.
+	->rename() on directories has (per-superblock) ->s_vfs_rename_sem.
 	->revalidate(), it may be called both with and without the i_sem
 on dentry->d_inode. VFS never calls it with i_zombie on dentry->d_inode,
 but watch for other methods directly calling this one...
@@ -226,7 +227,7 @@ ioctl:		yes	(see below)
 mmap:		no
 open:		maybe	(see below)
 flush:		yes
-release:	yes
+release:	no
 fsync:		yes	(see below)
 fasync:		yes	(see below)
 lock:		yes
@@ -238,12 +239,13 @@ The only exception is ->open() in the instances of file_operations that never
 end up in ->i_fop/->proc_fops, i.e. ones that belong to character devices
 (chrdev_open() takes lock before replacing ->f_op and calling the secondary
 method. As soon as we fix the handling of module reference counters all
-instances of ->open() will be called without the BKL. At the same point
-->release() will lose BKL. Currently ext2_release() is *the* source of
-contention on fs-intensive loads and dropping BKL on ->release() will get
-rid of that (we will still need some locking for cases when we close a file
-that had been opened r/w, but that can be done using the internal locking with
-smaller critical areas). sock_close() is also going to win from that change.
+instances of ->open() will be called without the BKL.
+
+Note: ext2_release() was *the* source of contention on fs-intensive
+loads and dropping BKL on ->release() helps to get rid of that (we still
+grab BKL for cases when we close a file that had been opened r/w, but that
+can and should be done using the internal locking with smaller critical areas).
+Current worst offender is ext2_get_block()...
 
 ->fasync() is a mess. This area needs a big cleanup and that will probably
 affect locking.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 611d8be80..072508d51 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1,4 +1,4 @@
-June 2000		  Kernel Parameters			v2.4.0
+July 2000		  Kernel Parameters			v2.4.0
 			  ~~~~~~~~~~~~~~~~~
 
 The following is a consolidated list of the kernel parameters as implemented
@@ -80,6 +80,8 @@ running once the system is up.
 
 	AM53C974=	[HW,SCSI]
 
+	amijoy=		[HW,JOY] Amiga joystick support 
+ 
 	apm=		[APM] Advanced Power Management.
 
 	applicom=	[HW]
@@ -139,6 +141,12 @@ running once the system is up.
  
 	dasd=		[HW,NET]    
 
+	db9=		[HW,JOY]
+
+	db9_2=		[HW,JOY]
+
+	db9_3=		[HW,JOY]
+ 
 	debug		[KNL] Enable kernel debugging (events log level).
 
 	decnet=		[HW,NET]
@@ -179,6 +187,12 @@ running once the system is up.
 
 	ftape=		[HW] Floppy Tape subsystem debugging options.
 
+	gc=		[HW,JOY]
+
+	gc_2=		[HW,JOY]
+	 
+	gc_3=		[HW,JOY]
+ 
 	gdth=		[HW,SCSI]
 
 	gscd=		[HW,CD]
@@ -194,10 +208,6 @@ running once the system is up.
 
 	hisax=		[HW,ISDN]
 
-	in2000=		[HW,SCSI]
-
-	init=		[KNL]
-
 	ibmmcascsi=	[HW,MCA,SCSI] IBM MicroChannel SCSI adapter.
 
 	icn=		[HW,ISDN]
@@ -208,40 +218,20 @@ running once the system is up.
 	
 	idebus=		[HW] (E)IDE subsystem : VLB/PCI bus speed.
 
+	idle=		[HW]
+ 
+	in2000=		[HW,SCSI]
+
+	init=		[KNL]
+
 	ip=		[PNP]
 
 	isp16=		[HW,CD]
 
 	iucv=		[HW,NET] 
 
-	js_am=		[HW,JOY]
-
-	js_an=		[HW,JOY]
-
-	js_as=		[HW.JOY]
-
-	js_console=	[HW,JOY]
-
-	js_console2=	[HW,JOY]
-
-	js_console3=	[HW,JOY]
-
-	js_db9=		[HW,JOY]
-
-	js_db9_2=	[HW,JOY]
-
-	js_db9_3=	[HW,JOY]
-
-	js_l4=		[HW,JOY]
-
-	js_pci=		[HW,JOY,PCI]
+	js=		[HW,JOY] Analog joystick
  
-	js_tg=		[HW,JOY]
-
-	js_tg_2=	[HW,JOY]
-
-	js_tg_3=	[HW,JOY]
-
 	kbd-reset	[VT]
 
 	load_ramdisk=	[RAM] List of ramdisks to load from floppy.
@@ -354,6 +344,8 @@ running once the system is up.
 
 	nosync		[HW, M68K] Disables sync negotiation for all devices.
 
+	notsc           [BUGS=ix86] Disable Time Stamp Counter
+
 	nowb		[ARM]
  
 	opl3=		[HW,SOUND]
@@ -484,6 +476,12 @@ running once the system is up.
 
 	tdfx=		[HW,DRM]
  
+	tgfx=		[HW,JOY]
+
+	tgfx_2=		[HW,JOY]
+
+	tgfx_3=		[HW,JOY]
+ 
 	tmc8xx=		[HW,SCSI]
 
 	tmscsim=	[HW,SCSI]
diff --git a/Documentation/networking/tulip.txt b/Documentation/networking/tulip.txt
index 11494e1dc..35d5dea65 100644
--- a/Documentation/networking/tulip.txt
+++ b/Documentation/networking/tulip.txt
@@ -142,6 +142,10 @@ tulip_core.c	- Driver core (a.k.a. where "everything else" goes)
 
 Version history
 ===============
+0.9.8 (July 13, 2000):
+* Correct signed/unsigned comparison for dummy frame index
+* Remove outdated references to struct enet_statistics
+
 0.9.7 (June 17, 2000):
 * Timer cleanups (Andrew Morton)
 * Alpha compile fix (somebody?)
diff --git a/Documentation/usb/usb-help.txt b/Documentation/usb/usb-help.txt
index 9abd4a08b..5ad2aaa57 100644
--- a/Documentation/usb/usb-help.txt
+++ b/Documentation/usb/usb-help.txt
@@ -1,5 +1,5 @@
 usb-help.txt
-2000-March-24
+2000-July-12
 
 For USB help other than the readme files that are located in
 linux/Documentation/usb/*, see the following:
@@ -7,10 +7,12 @@ linux/Documentation/usb/*, see the following:
 Linux-USB project:  http://www.linux-usb.org
   mirrors at        http://www.suse.cz/development/linux-usb/
          and        http://usb.in.tum.de/linux-usb/
-Linux USB Guide:    http://linuxusbguide.sourceforge.net
+Linux USB Guide:    http://linux-usb.sourceforge.net
 Linux-USB device overview (working devices and drivers):
                     http://www.qbik.ch/usb/devices/
     
-The Linux-USB mailing list is linux-usb@suse.com .
+The Linux-USB mailing lists are:
+  linux-usb-users@lists.sourceforge.net   for general user help
+  linux-usb-devel@lists.sourceforge.net   for developer discussions
 
 ###