Some socket hardware appears to "bounce" when a card is inserted - we
seem to receive more than one SS_DETECT event.  Unfortunately, this
causes us to initialise, setup the socket, and create the necessary
devices multiple times.

Fix this by ignoring card insertion events when we already know that
there is a card in the socket.

We must always allocate windows below 1MB when a socket driver
indicates that it does not have "page registers".  Handle this
case in rsrc_mgr.c within find_mem_region rather than each use
of find_mem_region().

Remove the racy check_mem_resource() function.  Instead, claim
the region while we check it, passing a resource structure to
the core validation functions.

The overwhelming majority of Linux users are using modular PCMCIA,
and loading the "yenta_socket" module.  2.5.71 unfortunately changed
the name to "yenta" when pci_socket.c was combined with yenta.c.
Rename yenta.[ch] to yenta_socket.[ch] for compatibility.

Although no such oops has been reported, removing a socket driver
while a file under /sysfs/class/pcmcia_socket/pcmcia_socket* is
held open by user space could potentially cause an oops.

Plug this by preventing pcmcia_unregister_socket from returning
until all references by sysfs to the pcmcia socket have been dropped.

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

Patch from Daniel Ritz

rmmod yenta produces the following oops:
Unable to handle kernel paging request at virtual address d084781e
EIP is at yenta_config_init+0x18f/0x1e0 [yenta]
Process pccardd (pid: 2618, threadinfo=c3236000 task=c988ae60)

Update sa11xx_core.c for Dominik's previous patch.

Remove the inquire_socket callback by moving the (static) capability
information to the top-level of struct pcmcia_socket.

Move the creation of /proc/pccard to ds.c so that ds.c is the only
file that needs to include linux/proc_fs.h any longer.

Remove the proc_setup callback. The drivers can use CLASS_DEVICE_ATTR
instead. Example: i82365.c.

A "\n" was at the end of the device name, sorry.

pcmcia_socket_class_data is (fortunately) not needed any longer.

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

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

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

From: Tom Alsberg <alsbergt@cs.huji.ac.il>

Add support for a new eepro100 PCI ID.

It's using "||" instead of "|".  Makes slab go BUG.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix parenthesisation in a combined assign-and-check-error statement.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix parenthesisation in a combined assign-and-check-error statement.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix parenthesisation in a combined assign-and-check-error statement.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

As we'll be checking `status' for errors, it had better not be unsigned.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix a check for underflow.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Don't compare unsigned value for < 0.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Don't check unsigned values for <= 0.

From: Ravikiran G Thirumalai <kiran@in.ibm.com>

Fix decnet ioctl(TIOCOUTQ).

From: Albert Cahalan <albert@users.sourceforge.net>

This is needed so that apps can set appropriate column widths for PID
display.

From: Joe Thornber <thornber@sistina.com>

Split the dm_create() function into two variants, depending on whether you
want the device to have a specific minor number.  This avoids the broken
overloading of the minor argument to the old dm_create().

From: Hugh Dickins <hugh@veritas.com>, Christoph Rohland <cr@sap.com>

Switches the long GPL blurb which Hugh took from the 2.4-ac version of
mm/shmem.c, back to the original oneliner (as in 2.4.current).

Christoph spotted that the long blurb says "either version 2 of the License,
or (at your option) any later version", whereas he intended it be as COPYING
says, version 2 period.  Hugh and Christoph are happier with known version 2
than undefined future variants.

From: James Morris <jmorris@intercode.com.au>

This patch against current bk removes anon_hash_chain from fs/inode.c, as
all inodes in the 2.5 kernel must be associated with a superblock, and the
anon hash is no longer needed.

(akpm: Well there's one inode with a null i_sb: swapper_inode.  But it
shouldn't get here and if it does, we'll fix it by other means).

From: Dipankar Sarma <dipankar@in.ibm.com>

Forward-port of a fix Alan merged into 2.4.21-pre.  It fixes arcnet oopses
with raw sockets.