into nuts.ninka.net:/home/davem/src/BK/net-2.5

into kroah.com:/home/greg/linux/BK/gregkh-2.5

You'll recall there was a change to the locking in that code after
it was submitted.  This is a better fix to that issue.

"Obviously correct", though I've not run with this in ages.

This is a 2.6 only fix for the FTP NAT helper code.  The patch below
(by Martin Josefsson) also closes Bug 933 in the kernel bug tracker.

The bug was introduced while making the helper compliant to the recently
introduced support for nonlinear skbs in netfilter.

the driver is registering the device too early, so that open may
see a partially initialised device.

Clean up irq urb when not enough memory is available.

This patch for the UHCI driver changes the test for over current inputs,
which can cause false Resume indications with some of Intel's USB
controllers.  Previously the code only checked for one specific controller
chip, but now another one has turned up that exhibits the same flaw.  It
seems best just to check for Intel being the manufacturer, especially
since it doesn't hurt to check for the condition when it isn't present or
is only temporary.

The patch from Frank was missing the auth flavor argument to
nfs_sb_init().  Trivial fix follows.

[ Side note: the code mixes the spellings 'flavor' and 'flavour', which
  is somewhat confusing.  That should probably be fixed to avoid confusion. ]

into home.osdl.org:/home/torvalds/v2.5/linux

This fixes various problems with the AD1816 sound driver:

 - Compilation errors with CONFIG_PNP enabled fixed.
 - PNP specific code rewritten.
 - SMP fixes.
 - DMA resource handling fixes.
 - Other minor code cleanup.

This causes blk.h to print a warning and removes all uses of blk.h.
I've tested the compilation in 2.6.0-test1 with a .config that tries to
compile as many drivers as possible.

Correct size of siginfo_t for s390x (from 136 to 128).

 - Reset netdevice to defaults in offline processing.
 - Fix checksumming.
 - Fix routing status display.
 - Get rid of _ccw_device_get_device_number in qeth.
 - Inline some functions to save stack space.

 - Fix two memory leaks.
 - Clear pending status in cio_enable_subchannel.
 - Don't call device_unregister from interrupt context.
 - Fix refcounting problems on static device structures for the ccw console.
 - Delete timeouts for qdio after successful startup.

Remove put_disk from dasd_destroy_partitions. This is done in dasd_free_device.

Enable irq statistics for s390*. We defined NR_IRQS to 2, one for all i/o
interrupts and one for all external interrupts.

 - New default configuration.
 - Fix get_tv32/put_tv32.
 - Replace generic dma-mapping file with empty one.
 - Remove wrong comment from dma.h.

The comment in nfs_get_root() basically describes the patch:

    Some authentication types (gss/krb5, most notably)
    are such that root won't be able to present a
    credential for GETATTR (ie, getroot()).

An easy way (ie, without this patch) to have unattended mounts is to
have a root/host@REALM (or similar) principal stashed in a keytab, which
root (rather, gssd) can use.  However, this might not be desirable for
many sites.  In any case, RFC2623 specifically describes the problem
addressed here.

Notes:

- Root inode gets inum of 1.  This doesn't seem to matter, but may be
  aesthetically unpleasing.  I wanted to choose an inum unlikely to
  conflict with an existing inum (although NFS has specific support
  for that).  It looks like more work than it's worth to change the
  inum after the info is available.  AFAICT it's not critical info.

- Solaris has this "wierd" (but understandable)  behavior that after
  mounting without a credential, the mount point is not visible at all
  until an access is attempted with a credential.  This now-you-see-it-
  now-you-don't behavior doesn't seem worthwhile to reproduce here.

- Unfortunately, MOUNT_VERSION must go to 5.  Some kernels with ver 4
  do not understand pseudoflavor.  Keeping it at 4 means that the
  userland mount can't know for sure whether the kernel accepted the
  option or not.  (Unless I'm missing some hack that could be done.)

It works in my environment, against a netapp server (with the rpcsec_gss
patch I provided earlier).

 - fix null dereference on xprt->inet if (!connected), which happens if
   a rpc cred wasn't available (root+auth_gss case)
 - set bufsize on reconnect

start gss seq no at 1; netapp doesn't accept seq no 0.

Just as a data point, Solaris 9 client uses initial seq. no. 2.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

This is a follow-up patch to my latest patch series.  It fixes the
problems and flaws Greg KH pointed out.

There was a typo in the Makefile, so the driver was never compiled.  But
I assumed that it built without errors.  Doh!

 - update the Technisat Skystar2 driver:
         - follow kernel coding rules, change comments
         - change function return values from u32 to int where possible
         - make all functions static
         - comment out unused functions
         - fix return values of functions to follow kernel rules
         - removed bogus delay, read and write functions

 - add two new usb dvb drivers:
   o dvb-ttusb-budget.c for Technotrend/Hauppauge Nova-USB devices
     (Thanks to Holger Waechtler <holger@convergence.de> and elix Domke
     <tmbinc@gmx.net>)
   o dvb-ttusb-dec.c for Technotrend/Hauppauge USB DEC2000-T devices
     (Thanks to Alex Woods <linux-dvb@giblets.org>)

 - fix DMX_GET_STC to get the msb right
 - follow changes in saa7146 driver core, separate some data for DVB-C
   and DVB-S cards

 - In alps_tdlb7.c read SP8870 status reg to clear pending irqs in
   FE_SET_FRONTEND, as suggested by Ragnar Sundblad to avoid frontend
   hang-ups.
 - the vp310 support in mt312.c support should be configured to 90Mhz,
   too.  skystar2 driver with bugfixed master_xfer() should probably
   work now.

 - tda1004x DVB-T driver contributed by Andrew de Quincy and Robert
   Schlalach

 - add drivers for the Orion and Gemini frame grabber cards, based on
   the saa7146.  For details, see http://www.hexium.hu/.  Thanks to
   Michael Hunold <michael@mihu.de>.

 - add DVB driver for Technisat Skystar2 card, which is based on the
   FlexCop2 chipset by B2C2

 - separate all EXPORT_SYMBOL stuff to saa7146_ksyms.c
 - properly stop capturing when no more buffers are available (missing
   register upload)
 - make extension data a per-device member, not a per-extension member,
   so that every device can have it's own private data (necessary for
   DVB drivers which handle more than one device)
 - implement field based capturing, ie.  capturing fields to different
   capture buffers
 - change default old of capture fields for ALTERNATE mode (comply with
   bttv)
 - follow these changes in various analog saa7146 based cards drivers
   (mxb.c and dpc7146.c)
 - follow these changes in various saa7146 based budget card drivers

 - Fix to 'Sharing SDRAM between TT re-insertion and OSD...' - OSD
   didn't get the maximum available memory in one piece; needs new
   firmware version 0x2616
 - Improved performance when setting palette with full 256 color OSD
 - read MAC from EEPROM if available, contributed by Michael Glaum
   <mglaum@kvh.com>
 - add some MODULE_PARM_DESC for modinfo
 - add support for the "analog module" available for DVB-C cards: the
   saa7113 is initialized and some more v4l2 ioctls are available.  you
   can use "xawtv" now to switch between "dvb" and "analog" input.  when
   you are one the "analog" input, you can tune in analog channels.

 - follow changes in dvb_net, use new eeprom parse code to properly
   detect the mac
 - add new subvendor/subystem id pair

 - Zarlink MT312 satellite channel decoder driver contributed by Andreas
   Oberritter