I would like to see a couple of the pcnet32 changes that I think we can
agree on be put into the trees so a couple of the potential defects can be
avoided.  The following patch contains just these pieces.  The only
controversial one is an arbitrary change in the number of iterations in a
while loop spinning on hardware state.   No matter how this is done, I am
not especially fond of this bit of code as it has no reasonable error
recovery path -- however, as a half-way, incremental solution, increasing
the polling time should help as the 100 value was certainly found to be
insufficient.  1000 may not be sufficient either, but it is certainly no
worse.

Both of the other changes were hit in testing (and I belive the wmb() at a
customer even), so it would help reduce some debug if these go in.  Any
feedback is appreciated - thanks.

The patch below removes obsolete #if'd code for kernel 2.0 and 2.2 from
drivers/net/wan/lmc/* (this includes the expansion of some #define's 
that were definded differently for different kernel versions).

This fix makes bonding not commit to a specific ABI version if the ioctl
command is not supported by bonding.

(It also removes the '\n' in the continuous printk reporting the link down
event in bond_mii_monitor - it got in there by mistake in our previous
patch set and caused log messages to appear funny in some situations).

This patch fixes the bug reported by Jay on April 3rd regarding long
failover time when releasing the last slave in the active aggregator. The
fix, as suggested by Jay, is to follow the spec recommendation and send a
LACPDU to the partner saying this port is no longer aggregatable and
therefore trigger an immediate re-selection of a new aggregator instead of
waiting the entire expiration timeout.

- Adds fragementation support to eth1394
- Fix race conditition in packet completion task call
- Fix lack of proper logic in tlabel allocation
- Fix brokeness introduced by "stanford checker fixes for memset" in
  ohci1394
- Add trivial PM resume callback in ohci1394 to support sleep/resume.

into home.transmeta.com:/home/torvalds/v2.5/linux

into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5

into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5

The data direction for the SCSI command was being strangely deduced
by checking for an old WRITE_6 command.

This makes the driver compile and run on the PARISC platform.
The biggest issue for this driver is the firmware layout because
the chip insists on reading from firmware a 16 bit word at a time,
so the entire byte layout of the firmware had to be reversed.

This patch will put us back to the 2.4 behaviour while preserving the
truncation speedup.  It's a bit dopey (why do the timestamp update in
the fs at all?) but changing this stuff tends to cause subtle
problems.

into raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5

From:  Hanna Linder <hannal@us.ibm.com>

From: René Scharfe <l.s.r@web.de>

  this fixes a trivial error in isofs/inode.c, and reformats
  the surrounding code a bit to (hopefully) enhance clarity.

  i_mtime.tv_nsec was initialized twice, and i_ctime.tv_nsec never

From:  Rusty Russell <rusty@rustcorp.com.au>

  Trivial unused var...

From: René Scharfe <l.s.r@web.de>

  This un-complicates a small piece of code of the dev/pts filesystem
  and decreases the size of the object code by 8 bytes for my build.

  Yay! :)

From:  Tom Rini <trini@kernel.crashing.org>

  The following marks videodev_proc_destory as __exit.

  This is safe as its only caller is marked as __exit as well.

From:  Pavel Machek <pavel@ucw.cz>

  This kills a compile warning in swsusp

From:  Stephen Rothwell <sfr@canb.auug.org.au>

  This allows some architecture to override the generic implementations
  on {get,put}_compat_flock64 as some of them (ia64 and maybe x86_64)
  will take alignment faults when accessing the loff_t members of struct
  compat_flock64.

  Requested by David Mosberger, modified by Dave Miller.

From:  Pavel Machek <pavel@ucw.cz>

From:  Pavel Machek <pavel@ucw.cz>

  This adds some more commentary to the boot-up code.

From:  Scott Russell <scott@pantastik.com>

  - missing release_region (reported by kbugs.org)
  - removed extraneous return (Randy Dunlap)

From:  Pavel Machek <pavel@ucw.cz>

  This fixes url in ioctls, fixes some kernel parameters, kills comment
  in tty that is 10+ years old and wrong, and adds me a little
  credits.

From:  Jonathan Corbet <corbet@lwn.net>

  This fixes a couple of little mistakes in Documentation/NAPI_HOWTO.txt;
  I also updated the interrupt handler stuff while I was at it.  Jamal Hadi
  Salim has seen and acked it.

From:  Scott Russell <scott@pantastik.com>

  - Rearranged unreachable code reported via kbugs.org

From:  Matthew Wilcox <willy@debian.org>

  These defines are simply not used any more.

From:  Jesse Barnes <jbarnes@sgi.com>

  Quick add to the maintainers file for SN (aka Altix 3000) support in
  the kernel.

From:  Adrian Bunk <bunk@fs.tum.de>

  the patch below removes the unneeded #define LinuxVersionCode from
  eata.c. It's not used and if it was needed KERNEL_VERSION in
  include/linux/version.h does the same.

From:  Steven Cole <elenstev@mesatop.com>

  This is a slightly improved version of the additional help texts for
  sound/oss/Kconfig.  The originals were obtained from 2.4.21-pre4.

From:  Scott Russell <scott@pantastik.com>

  - Rearranged unreachable code reported at kbugs.org

From:  Adrian Bunk <bunk@fs.tum.de>

  The following trivial patch updates the short description for
  BLK_DEV_HPT366 (the HPT372 and the HPT374 are supported, too):

From:  Jonathan Corbet <corbet@lwn.net>

  This fix has been acked by James Bottomley, but has not risen above Linus's
  threshold.