Based upon a patch from Keith M Wesolowski <wesolows@foobazco.org>

Based upon a patch from Jakub Jelinek <jakub@redhat.com>

sound/pcmcia/vx/vx_entry.c:

This patch removes the PCMCIA timer release functionality which is no
longer required. Without this the module does not compile.

Too much cut-and-paste, noticed by Dmitry Torokhov <dtor_core@ameritech.net>

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

On PPC32 we reorder the arguments so they fit into 6 registers.  Glibc will
need a two-line stub to change them from the standard order to the ordering
used by the system call: (fd, advice, offset, len).

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

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

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

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

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

In both 2.4 and in 2.6, error handling for bad cdrom media is
wrong.  And it is my fault I'm afraid, since I botched an earlier
fix for the problem by putting the fix in the wrong spot.

My kids have a "Jumpstart Toddlers" cd they have long since
completely killed, which makes a great test disc.  Without this
fix, the best time projection I can get for completing a dd type
sector copy is about 2 years...  Most of that is spent thrashing
about in kernel space trying to re-read sectors we already know
are not correctable....  After the fix, I was able to rip a copy
the CD (or rather muddle through it getting lots of EIO errors)
in about 15 minutes.

Attached is the fix for 2.6.x,

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

of requiring users to select SCSI in order to see it.

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.5

From Christoph Hellwig

From David Mosberger:

> We definitely are seeing some strange crashes in get_ksymbol_core().
> I think the reason is the lack of iterator initialization.

Yes, looks good: reset the iterator at allocation.

Remove the PCMCIA release timer that got missed in earlier patch.  This
is required for successful compilation of the driver.

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.5

nfsroot_mount().

Problem analysis and fix provided by Andries Brouwer.
Cleanup of nfs_lookup() by me...

o inline assembler funcs cleanup
o machine depend header cleanup
o interrupt management fix

o build script update
o interrupt management fix
o mtd support fix
o signal handling fix

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

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

a valid SEP bit. The errata has it right: you have to have at
least model 3, stepping 3. Not "model >= 3 or stepping >= 3".

Fix the test accordingly.