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.

Rename socket_info_t (which is used many, many times differently
within pcmcia) to "struct pcmcia_bus_socket".

Also, a couple of functions in ds.c can be converted to use the "struct
pcmcia_bus_socket" as argument instead of the socket number.

As we don't have a late_initcall in ds.c any more, we can't easily
distinguish between in-kernel drivers and those built as modules. This
information was used by cardmgr to detect whether "rmmod" makes
sense. As unloading of modules seems to be deprecated behaviour anyway
in 2.5., and the current driver unloading process is IMO broken
anyway, I don't shed any tears on this lost functionality.

Previously, "Driver Services" could only be called when the socket
drivers were initialized earlier. This caused an awful lot of
problems, especially when modprobe tried to load ds.ko and a pcmcia
card driver at once.

As all socket devices are registered with the driver model core as
being of "class_type pcmcia_socket_class", we can take use of that and
register them with "Driver Services" upon detection or upon
module loading of ds.c.

Also, the "I-need-two-initcalls-in-a-module"-tweak can go away.

Unfortunately, this patch reportedly breaks some RedHat pcmcia init
scritps - they relied on the failed loading of ds.c to detect that no
socket driver was loaded previously. To properly detect this, you
should take a look at the /sys/class/pcmcia_socket/devices directory.

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

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

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

This one should have gone away a few checkings ago.  I blame it on
BitKeeper.. :)

SGI Modid: 2.5.x-xfs:slinx:142389a

Also use del_timer_sync when we're done.

SGI Modid: 2.5.x-xfs:slinx:142197a

also fix a bug where the mtime field was not correctly updated.

SGI Modid: 2.5.x-xfs:slinx:142296a

this into just a pagebuf_iodone parameter was broken as we don't have
sufficient state in all the places we need it to make the decision.

SGI Modid: 2.5.x-xfs:slinx:141626a

SGI Modid: 2.5.x-xfs:slinx:142170a

SGI Modid: 2.5.x-xfs:slinx:142163a

realtime inode detection macro somewhere more appropriate.

SGI Modid: 2.5.x-xfs:slinx:141951a

SGI Modid: 2.5.x-xfs:slinx:141925a

Push a bunch of quota- and dmapi-specific code down into these
subdirs which previously was compiled into the core XFS code,
and don't descend into these subdirs if options config'd off.

SGI Modid: 2.5.x-xfs:slinx:141850a

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