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.

(contributed by Adam Kropelin)

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

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

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

This is a minimal patch to allow me to load/use the atp module so I can do
further testing work on it.

Here's an additional patch that contains the cleanups I did to John's
timer patches.  It does the following:

	- uses C99 initializers
	- makes the timer list static
	- adds better documentation to the timer function structure
	- makes the timer init function return 0 on success
	- NULL terminates the list of timers to make further patches
	  easier.

The 2.5.x RPC code is currently broken in that it demands that all
tasks that call xprt_create_proto() in order to open a TCP socket must
have CAP_NET_BIND_SERVICE capabilities, and must bind to a privileged
port.

This breaks the NLM locking code and its use of the call_bind() RPC
portmapper lookup feature.

This patch allows the built-in portmapper client to use unbound TCP
sockets if the user does not have the necessary capabilities.

This is a nontrivial change to the NFS client.

In this patch, we finish modifying the async READ path so that it is
version-agnostic.  We define a new nfs_rpc_op ->setup_read(), and move
the v2- and v3-specific code in nfs_read_rpcsetup() there.  We also
have to change nfs_readpage() result so that the 'count' of bytes
read is a parameter.  The extra parameter means that it can no longer
be ->tk_exit().  Instead, it is called from a version-specific ->tk_exit()
routine which is set in ->read_setup().

The upshot of all this is that the version-specific part of the
async READ path has been encapsulated in a new nfs_rpc_op
->read_setup(), and NFSv4 can share the logic for asynchronous
READ's with NFSv2 and v3.

This is a nontrivial change to the NFS client.

Synchronous READ operations are currently done via the ->read() nfs_rpc_op.
Therefore, the synchronous READ path can easily be adapted for NFSv4.  On
the other hand, the asynchronous READ path contains several NFSv3-specific
features, which make it difficult to adapt for NFSv4.

In this patch and the next, we modify the async READ path to be
version-agnostic.  This patch just changes the 'struct nfs_read_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.

If the NFS_ATTR_FATTR_V4 flag is set, use the NFSv3 convention for
the 'space_used' part of the fattr.

This is a nontrivial change to the NFS client.

NFSv4 defines a new file attribute, change_attr.  This is a per-file
opaque quantity returned by the server, whose value is required to
change whenever the file is modified.  If it exists, we want to use
it for all cache consistency checks in nfs_refresh_inode().  Some
operations also return a "pre-operation" value of the change_attr;
we want to take this into account too.

First, define flags
  NFS_ATTR_FATTR_V4 - indicates that the 'struct nfs_fattr' is an
                      NFSv4 fattr, so the change_attr field is valid
  NFS_ATTR_PRE_CHANGE - indicates that the server returned a pre-operation
                      change_attr, so the pre_change_attr field is valid

Second, change nfs_refresh_inode() so that the caches are invalidated
if there is a change_attr mismatch.  Exception: If the pre_change_attr
tells us that the mismatch was caused by our operation, then do not
invalidate the caches.

This patch should leave the logic in nfs_refresh_inode() unchanged
if neither of the new flags are set.