Linus said [on April 25th of this year]:
> There are two reasons I did pci_socket, and one of them is stale
> and the other one is a matter of taste.

As the second reason is stale now, too, unify yenta.c and
pci_socket.c.

Remove socket_no from struct pcmcia_bus_socket - it's only used in
printks, and the one additional level of indirection doesn't hurt there.

 ds.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

Replace the socket number with struct pcmcia_socket from mtd_bind_t
and bind_req_t.

 drivers/pcmcia/cs.c |    4 ++--
 drivers/pcmcia/ds.c |    6 +++---
 include/pcmcia/cs.h |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

As "socket_no" is deprecated, replace it with struct pcmcia_socket in 
client_handle_t.

 bulkmem.c     |    4 ++--
 cs.c          |   22 ++++++++++------------
 cs_internal.h |    4 ++--
 3 files changed, 14 insertions(+), 16 deletions(-)

This patch updates the callbacks to the socket drivers to take the
corresponding struct pcmcia_socket as argument instead of the "socket
number".

 drivers/pcmcia/bulkmem.c    |    6 +++---
 drivers/pcmcia/cistpl.c     |    4 ++--
 drivers/pcmcia/cs.c         |   18 +++++++++---------
 drivers/pcmcia/i82092.c     |   36 +++++++++++++++++++++++-------------
 drivers/pcmcia/i82092aa.h   |   20 ++++++++++----------
 drivers/pcmcia/i82365.c     |   34 +++++++++++++++++++++++-----------
 drivers/pcmcia/pci_socket.c |   40 ++++++++++++++++++++--------------------
 drivers/pcmcia/rsrc_mgr.c   |    2 +-
 drivers/pcmcia/tcic.c       |   35 ++++++++++++++++++-----------------
 include/pcmcia/ss.h         |   22 ++++++++++++----------
 10 files changed, 121 insertions(+), 96 deletions(-)

Re-enable the suspend and resume methods for SA11xx PCMCIA devices,
and update the initialisation/cleanup code for Dominik's recent
changes.

Add a more sane socket registration interface.

Previously, it was messed up because Greg's struct class hadn't been
invented when I wrote the code: there may be multiple sockets per
"struct device", and there is the need for one "struct class_device"
for each socket.

 drivers/pcmcia/cs.c         |  217 +++++++++++++++++++++----------------------- drivers/pcmcia/ds.c         |   56 ++---------
 drivers/pcmcia/i82092.c     |   48 ++++-----
 drivers/pcmcia/i82365.c     |   41 ++++----
 drivers/pcmcia/pci_socket.c |   23 +---
 drivers/pcmcia/pci_socket.h |    2
 drivers/pcmcia/tcic.c       |   38 ++++---
 include/pcmcia/ss.h         |   25 +++--
 8 files changed, 210 insertions(+), 240 deletions(-)

Split up the socket initialization in cs.c into two pieces:

        pcmcia_register_socket / pcmcia_unregister_socket 
will focus on registering sockets with the device core in future, set
all necessary fields etc.

        pcmcia_add_socket / pcmcia_remove_socket 
will use an interface to the device class "pcmcia_socket_class" in
future, and mainly take care of what initialization cs.c needs to work
properly.

This patch is almost completely limited to shuffling code around

 cs.c |  157 +++++++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 83 insertions(+), 74 deletions(-)

If we use try_module_get(driver->owner) at the right place (and
module_put as well, of course), the check for (driver->use_count > 0)
can't ever return true. So get rid of it, and add the proper module
locking calls.

 ds.c |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)

This patch removes the socket_table from cs.c and friends.

 bulkmem.c     |    2 -
 cs.c          |   83 ++++++++++++++++++++++++---------------------------------- cs_internal.h |    7 ++--
 ds.c          |    2 -
 rsrc_mgr.c    |   10 ++++--
 5 files changed, 46 insertions(+), 58 deletions(-)

This adds a list of all pcmcia sockets which will replace the current
table-based approach. Also, ds.c now relies on cs.c to get the proper
"struct pcmcia_bus_socket *" for the corresponding socket number.

This patch introduces "struct pcmcia_socket" which is 100% equal to
the "socket_info_t" defined previously in drivers/pcmcia/cs_internal.h

Unfortunately, a few other definitons need to be moved as well.

 drivers/pcmcia/cs.c          |    4 -
 drivers/pcmcia/cs_internal.h |   73 ---------------------------------
 include/pcmcia/ss.h          |   94 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 97 insertions(+), 74 deletions(-)

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

When foo is unlinked, nfs_unlink() does a sillyrename, this puts the
dentry on nfs_delete_queue, and (in the VFS) unhashes it from the
dcache.  This causes problems, since any later access to the
silly-renamed new .nfs file will create a NEW dentry that aliases the
one we originally created, but unhashed.

This causes various confusion, especially if we want to try to delete it
again later.

So fix this by not unhash the dentry after silly-renaming.  In 2.2, each
fs was responsible for doing a d_delete(), in 2.4 and later it happens
in the VFS layer and I think it was just an oversight that the 2.4 VFS
doesn't consider sillyrename (considering the code and comments that are
cruft).

Also fixed up some comments while debugging this.

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

[From Patrick Caulfield]

Pull dm_div_up() out of dm-table.c into dm.h

Some targets may perform io of their own volition, eg. a mirror
performing recovery, a cache target pulling in different chunks.  We
cannot let them perform this io while the device is suspended.  This
patch adds 2 new methods to the target type, which instruct the target
to suspend/resume itself.  All targets start in the suspended state,
so should expect an initial resume call.  Simple targets do not need
to implement these functions.

Replace __HIGH() and __LOW() with max() and min_not_zero().

This removes the last sources of "non-ANSI parameter list" warnings for
zlib_deflate.

Reduce MAX_MEM_LEVEL to 8.  This reduces zlib memory consumption by
128k (from ~400k to ~270k) at the theoretical cost of worse
compression.  No code currently in the kernel actually uses the better
compression, so the practical cost is zero.

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