If we fail to map the CIS space, don't pollute the CIS cache with
invalid data.

Patch from Daniel Ritz.

Add zoom video support for tosiba ToPIC97 and ToPIC100 chips.

Now that we clearly know what each quirk type is doing, we can think
about switching some devices to different quirks.

Looking at the various data sheets for these devices, many of them
support the MBURSTUP bit, so we can move these to the quirk which
supports setting this bit.

Move re-initialisation from the socket init/resume paths to where it
belongs - the main initialisation path.

There is less reason for socket initialisation to vary between
controller types now.  In fact, we could very well get rid of
much of the TI-specific socket initialisation quirk handling,
since TI realised that they should be more compatible with other
implementations in later versions of their bridges.

Add per-quirk power management to aid saving/restoring controller
specific state.  Also, add proper pci state saving/restoring.
Note that Cardbus bridges have to save and restore at least 0x48
bytes of configuration space, not 0x40.

This replaces the rather muddy save state in early initialisation,
restore it on socket init stuff that we previously had.

This removes the horrible side effect where we modify the generic
yenta_socket_operations structure (which of course other sockets
may be using.)

We move the socket init quirks into our cardbus_type quirk
structure, and call it during the generic socket initialisation.

Move the quirk selection to the main PCI ID table, and list the quirks
by type.  Introduce "cardbus_type" structure to contain the quirk
information.

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.

into camp4.serpentine.com:/export/bos/bk/linux-early