When show_stack() was changed to take two arguments, the use in the
voyager code was not converted.  This patch makes the correct
conversion.

These macros belong in asm-i386/scatterlist.h instead.

As the headers are disentangled this has shown up as a problem with my
MCA SCSI drivers since they no-longer include asm/pci.h in any form but
need to traverse the scatterlist.

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

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

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

Since the cs.c pcmcia core has a per-socket thread, we don't need each
socket driver having a work queue and associated complexity.

Therefore, remove this complexity and allow the socket drivers to call
pcmcia_parse_events directly from their interrupt or timer handlers.

Remove register_callback methods.  Instead, allow socket drivers
pass their events directly into cs.c via pcmcia_parse_events().

Add work-around for i82365-based socket drivers to the core PCMCIA
code.  Since insert processing is not a time critical event, we can
afford to delay (by sleeping) these for everyone.

Get/Put module when we insert and remove a card.  This avoids a
potential deadlock when socket drivers are unloaded, and we have
a cardbus card known to the system.

Move ->owner field from socket operations to pcmcia_socket.  (This
change is mainly for the SA11xx drivers, which use a core driver
for the chip, and a separate module for all the machine specific
bits.)

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

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

From Jay Estabrook:
> Here's a real short one that fixes a GENERIC build problem introduced
> in pre2, and finalizes the SABLE/LYNX support setting of HAE-4, making
> X servers finally work on those platforms.

into jet.(none):/home1/jejb/BK/scsi-for-linus-2.5

The SCSI_IOCTL_SEND_COMMAND ioctl does not work in 2.5.73-bk7. The
following patch (possibly mangled by my mail client) does fix the problem
(introduced in 2.5.73):

Doing some debugging after the SDET failure, I found that
if we reject a command at zero depth, we can get into the
infinite loop where we refuse a command to a LUN because it
is starved, but there's no returning command to run the SCSI
queues and fix the starvation.

The solution is to accept the command and remove the LUN from
the starved list.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into intercode.com.au:/home/jmorris/bk/net/net-2.5

Split xfrm_state_replace into xfrm_state_add and xfrm_state_replace.

Fixes:
1. Only update update lifetime and encap options if the state is valid.
2. Disallow updates to states that do not exist.
3. Bail if afinfo cannot be found.
 
This brings SADB_UPDATE in line with what is required by RFC2367.
It is also needed by SFS NAT-T support as it needs to update valid
states when the encap ports move.

I've tweaked the logic slightly so that SADB_UPDATE will fail on a
larval state that hasn't undergone SADB_GETSPI.  This is what RFC2367
calls for and it simplifies the code in that we don't have to call
find_acq for SADB_UPDATE.

This doesn't affect any of the three KMs as they either don't use
SADB_UPDATE or call SADB_GETSPI before doing an update.

The source address of an SA is not necessarily equal to the source address
in the selector.  This patch addresses this problem.

into linux-ipv6.org:/home/jmorris/bk/net/work-2.5

Use macro IP6_MF for the M-Flag.
Clean-up for readability (commented by <aj@dungeon.inka.de>).

 ETH1394  : - Minor cleanups.
            - Fix incorrect error handling with no broadcast channel.
	    - Set max/default MTU to 1500.
	    - Fix broken spinlock handling on device open.
 IEEE1394 : Make bus-nodeid printk's of a consistent format.
 OHCI1394 : Change one printk to a verbose/debug only message.

into kernel.bkbits.net:/home/jmorris/net-2.5

This adds support for the Q720 MCA SCSI driver.  It's only really
useful on the voyager platform.  The driver is preliminary and
currently makes no use of the Q720 on-board memory for storing
scripts and ccbs.

- Remove direct configuration of this driver
- Only remaining use is in the parisc zalon driver
- Split the driver up to make it more use to 720 based drivers
- Update zalon to new module/SCSI methods

nmclan_cs doesn't compile with older compilers

From: Nick Piggin <piggin@cyberone.com.au>

It converts writes to reads and we end up returning the request to the wrong
queue.

The ext3 version number hasn't been updated since ext3 was merged.

We track ext3 via the kernel release ID.  Remove the ext3 version
number.

From: Philippe Elie <phil.el@wanadoo.fr>

kmem_cache_destroy() can fail with the following error: slab error in
kmem_cache_destroy(): cache `xxx': Can't free all objects but the cache
user really free'd all objects

This is because drain_array_locked() only frees 80% of thge objects.

Fix it by adding a parameter to drain_array_locked() telling it to drain
100% of the objects.

From: Bob Miller <rem@osdl.org>

Removed the check_mem_region() call and replaced with request_mem_region().

Because of the way the driver is structured the first request_mem_region()
call gets the default memory area.  After probing the complete memory area
that is needed to communicate with the device is known, so the first memory
area is released and the complete area is requested.

From: Bob Miller <rem@osdl.org>

- Replace the call to MOD_INC_USE_COUNT with a __module_get() when
  forcing the module to not be unloadable.

- Remove the check_region() calls and restructured things to only use
  request_region().

From: Kouichi ONO <co2b@ceres.dti.ne.jp>

in 2.5.73, I can't read/write mount DVD-RAM via ide-scsi (only r/o mount).
Without ide-scsi, I can mount DVD-RAM read/write mode and works fine.

(acked by Jens).