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

into samba.org:/home/paulus/kernel/for-linus-ppc

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

we're writing over TCP and have done a partial send.

  The following patch by Joe Korty removes an over-zealous check in the NFS
  read code that causes pages to be incorrectly marked with PG_error and
  hence causes an EIO to be returned to userland.

  The test is incorrect as it ignores the fact that we may be caching a
  write that will extend the file on the server (and hence will create a
  hole in the region concerned.).

a null 'p_proc' procedure pointer.

and drop the 'flags' argument (it was always set too LOOKUP_PARENT).

If the user supplies and empty path, return -ENOENT.

Doing this ensures that we keep probing the connection to the server
rather than just waiting for the entire congestion window to time out.
The latter can be very expensive due to the exponential backoff rule.

Thanks to  Angus Sawyer <angus.sawyer@dsl.pipex.com> and
   Daniel McNeil <daniel@osdl.org>

Also reformat some printks so lines don't exceed 80chars.

Thanks to  Angus Sawyer <angus.sawyer@dsl.pipex.com>

From: Daniel McNeil <daniel@osdl.org>

This fixes an oops caused by incorrect usage of sector_div()
in which_dev() in md/linear.c.  It was dereferencing an non-existent
hash table entry.

We currently hold a read_lock of dparent_lock
while calling exp_get_by_name on several ancestors
of a given dentry.  However exp_get_by_name can
malloc(GFP_KERNEL), so that isn't a good idea.

Now we only claim the lock while actually
stepping up the parent chain.

This addresses bug 29 @ bugme.osdl.org

encode_read: change 'len' variable from unsigned long to a long for
'(len > 0)' comparison.  don't set up a tail iovec for zero length
reads.

NFSv4 operations after WRITE are decoded into wr_vec[] pages, thus the
argp->pagelen can be non-zero at the end of decoding the WRITE
operation.

This patch correctly sets argp->pagelen, and correctly advances argp->p
after the WRITE operation

Fix some misleading comments, and correct the test for requesting more
than one page.

From Steven Cole

From Osamu Tomita

(Stanford Checker, Chris Wright)

From Christoph Hellwig I think

From Osamu Tomita

Fix up 3w-xxxx. I didnt test SMP and it shows

Forward port the replacement to the horribly broken locking in 2.5
radio_cadet driver.

Vojtech Pavlik

The ide fixes for the VIA8235 obsolete this hack

One from Jens - fix up the problems with older Samsung disks that don't
abort unknown commands sometimes

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

Except for dev_node_t, the contents of include/pcmcia/driver_ops.h
aren't used anywhere within the kernel. It's a left-over file from the
days when cardbus 32-bit cards weren't handled as pci devices, and
their drivers as pci drivers. So, move the dev_node_t to
include/pcmcia/ds.h, remove the lone in-kernel reference to
driver_ops.h, and remove the contents of driver_ops.h.