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

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

Don't release NULL resources.

Patch from William Lee Irwin II.

A trivial loose end: add a 'lease_time' field to 'struct nfs_fsinfo'.

Now that all calls to nfs_async_handle_jukebox() have been moved to
fs/nfs/nfs3proc.c, we clean up by moving the nfs_async_jukebox() routine
itself there.  We also rename it nfs3_async_handle_jukebox(), to be
consistent with the naming conventions of that file.

In NFSv3, an RPC is retried if the special error NFSERR_JUKEBOX is
received.  This generic bit of postprocessing happens invisibly for
synchronous RPC's, but in the async case, the ->tk_exit callback
must call nfs_async_handle_jukebox() by hand.

In NFSv4, we also need generic postprocessing of async RPC's, but
the details are different.  Therefore, we don't want to call
nfs_async_handle_jukebox(); we want to call a different, NFSv4-specific
routine.  Therefore, we want to move calls to nfs_async_handle_jukebox()
out of the "generic" NFS code and into NFSv3-specific routines.  This
has already been done for async READ and WRITE in the preceding patches,
but there is still one outstanding case: the async REMOVE in sillyrename.

This patch removes nfs_async_handle_jukebox() from the async sillyrename
path, and puts in the NFSv3 ->unlink_done() rpc_op.

This is a nontrivial change to the NFS client.

This patch does for the async WRITE and COMMIT paths what patch 15
did for the async READ path, by defining new nfs_rpc_ops ->setup_write()
and ->setup_commit().

This is a nontrivial change to the NFS client.

This patch does for the async WRITE and COMMIT paths what patch 14
did for the async READ path, by changing 'struct nfs_write_data'
so that the v2- and v3-specific parts are moved into a private area,
with room for a v4-specific part in parallel.  None of the logic is
changed.

The Nagle algorithm gets in the way when sending short RPC messages to
the server. The following patch from Chuck does the equivalent of
setting TCP_NODELAY on the socket.

The following seems to have survived the purge ..

Fix uniprocessor compilation.

do_timer.h needs asm/mpspec.h for the declaration of `using_apic_timer'

Rework lots of cruft in the aic7xxx_old driver so that it can be more
easily read and understood by other people and so it starts on the road
to giving a clearer picture of how to interact with the scsi mid layer.

This does 4 things.  Fixes the oversight James found about cmd_per_lun.
Makes scsi_adjust_queue_depth() implement the usage of tagged that I
described in my email to linux-scsi.  Updates some comments to highlight
things that are going to go away shortly.  Removes the call to
host->select_queue_depths() entirely since drivers that implement this
will try to set SDptr->queue_depth to the desired depth, which in reality
will do nothing but confuse the mid layer since that is now the actual
allocated command counter, so it won't make the mid layer allocate more
commands, it will make the mid layer think more commands have been
allocated.

Start removing items from scsi.h that are driver specific and provide a
patch to NCR53C9x.? that switches to driver private storage instead as
an example of how drivers should do private struct storage

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

Also fixes a bug when UTP port is unplugged.

Also some minor cleanups as well.

[This patch qualifies for the cavemen ugh-lympics, because the driver does
some really nasty things in interrupt context and this patch does
not correct that.  However, the patch is an incremental improvement
over the current code so it's still worth applying.  I'll fix it
further if IBM does not fix it first.  -jgarzik]

* don't read PCI bus for values stored in struct pci_dev
* remove silly BUG() in e1000_sw_init, and
* return error from e1000_sw_init

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

        o [CORRECT] Start timer before sending event to fix race condition
        o [FEATURE] Improve the IrLMP event debugging messages.

        o [FEATURE] Fix some comments
        o [FEATURE] printk warning when we detect buggy QoS from peer
        o [CORRECT] Workaround NULL QoS bitfields
        o [CORRECT] Workaround oversized QoS bitfields
        o [FEATURE] Add sysctl "max_tx_window" to limit IrLAP Tx Window

        o [FEATURE] Fix spelling UNITIALISED => UNINITIALISED
        o [CORRECT] Accept data from TTY before link initialisation
                This seems necessary to avoid chat (via pppd) dropping chars
        o [CRITICA] Remember allocated skb size to avoid to over-write it
        o [FEATURE] Remove  LM-IAS object once connected
        o [CORRECT] Avoid declaring link ready when it's not true

        o [FEATURE] Export CRC16 helper so that drivers can use it

                <Following patch from Martin Lucina & Christian Gennerat>
        o [FEATURE] Rewrite of the toshoboe driver using documentation
        o [FEATURE] Support Donau oboe chipsets.
        o [FEATURE] FIR support
        o [CORRECT] Probe chip before opening
        o [FEATURE] suspend/resume support
        o [FEATURE] Numerous other improvements/cleanups
        o [CORRECT] (me) Remove save_flags()/cli() for spinlock
                <Currently, we keep the old toshoboe driver around>
        o [FEATURE] Config.help for ma600 driver (unrelated ;-)

                <Following patch from Martin Diehl>
        * merge+sync with changes from recent kernels: pci_[sg]et_drvdata,
          __devexit_p, netdev->last_rx, irda header cleanup
        * add netdev tx_timeout which re-initializes the whole thing
        * add power management support consistent with pci driver api
        * major rework of the ring descriptor operations
        * make correct usage of consistent and streaming pci dma api
        * nuke last virt_to_bus() and friends
        * support MIR/FIR highspeed interaction pulse (SIP)
        * review all paths for packet-size issues (rx and tx)
        * fix an old issue requiring hw powercycle caused by a race
          between IrLAP and hardware when switching _back_ to default
          speed at LAP disconnect. This was opened by the complete async
          behaviour of netdev->xmit but didn't happen before your latency
          improvements went into the stack.
        * add driver status readout under /proc/driver/vlsi_ir/irda%
          For 2.5, this will probably go into driverfs once things have
          stabilized.
        * fix potential deadlock in speed changing code
        * make identical driver working for both 2.4 and 2.5
        * add __attribute__((packed)) to hardware-exposed struct
        * add suggested pci_dma_prep_single() to flush cpu cache before
          streaming dma buffer gets reused for busmastering

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

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

The reason Vojtech broke it was the stupid name of a field
in struct kbd_repeat, namely "rate".  Every sane person
expects that a rate has dimension [1/sec], but here the
"rate" is a time period measured in msec.

So, the patch below first of all fixes the code,
and secondly changes the name.
Since Vojtech used PERIOD as index, I also used period
as field name in the struct.

Half of the stuff below is actually from Alan Stern.

Andries

handling of flag bits, etc.

This fixes the scheduler's migration code to not disable preemption.  It
also fixes the bug that was hidden by the broken disable-preempt change:
the migration thread did not kick idle CPUs if a task is migrated to
them, which causes a hung boot when ksoftirqds are started.  It was pure
luck it worked until now, it was broken pretty much from day 1 on.

Quick fix for CONFIG_NLS, add a missing space.