into ppc970.osdl.org:/home/torvalds/v2.6/linux

SMBulogged off.  Fixes umounting bug (pointed out by Nick Millington)
when multiple mounts with different userids are mounted to the same
server from the client.  

Signed-off-by: Steve French (sfrench@us.ibm.com)

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into pobox.com:/spare/repo/net-drivers-2.6

into pobox.com:/spare/repo/net-drivers-2.6

We better stop the queue in the close call.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Pure microcosmetic.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

The combined allocation of of receive and transmit rings and driver data
so far made the use of netdev_priv impossible.  Split the allocation
and use netdev_priv to access the non-ring driver_private data.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Rate limit a (apparently) harmless warning in orinoco.c

(My laptop remained connected with active X applications running over
ssh while this message was hitting every second, since I patched my
driver to include this the problem hasn't recurred.)
Signed-Off-By: Ryan Anderson <ryan@michonline.com>

Cleanup pcnet32 IRQ handling based on suggestions from Ralf Baechle
<ralf@linux-mips.org>, and Brian Murphy <brian@murphy.dk>

Tested by myself and Brian Murphy.

Please also apply to 2.4.27-pre6.
Signed-off-by: Don Fry <brazilnut@us.ibm.com>

This patch fixes a receive hang that occasionally occurs after a Tx
FIFO underrun.  The receive dma remains in a hung state sometimes.  The
transmit operations continue to occur, but no receive activity.

This was reproduced on several ppc64 systems and the fix has been verified
there.  The patch has been tested as well on an ia32 system, which did
not experience the hang because it did not have fifo underruns, which is
a preqrequisite for the hang.  The memory barriers decreased the frequency
of occurrence.  The final change to reset the chip instead of just stopping
it eliminated the last hangs.

Please also apply against 2.4.7 (with offset of -1), tested ia32.

Signed-off by: brazilnut@us.ibm.com

This patch will discard received frames that are larger than one buffer.
This has been tested on ia32 and ppc64 systems.

Please also apply to 2.4.7 (with offset of -3), tested ia32.

Signed-off by: brazilnut@us.ibm.com

Let's get this thing not using bus_to_virt() anymore,
as follows.
Signed-off-by: David S. Miller <davem@redhat.com>

===== drivers/net/hamachi.c 1.35 vs edited =====

Without this patch, insmod-ing the sunhme module crashes on my fc2
box.

		-- JF

* Resetting the adapter blew away management settings.  So we save the
important bits before performing a reset.

Sparse does not handle K&R at all, and I think I saw Linus saying that
he has no intention of adding it to sparse while ago. So here is a blob
of patch to convert drivers/net/skfp/* from K&R to ANSI-C. Compile
tested with "make allmodconfig" on x86, as I obviously don't have the
HW.

Mika
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

From: Yoshinori Sato <ysato@users.sourceforge.jp>

- H8/300 target support
- fixed irq support
- high address (>0xffff) i/o fix
Signed-off-by: Andrew Morton <akpm@osdl.org>

Vitaly V. Bursov <vitalyvb@ukr.net> wrote:
>
> there are multiple vulns in drivers/net/eql.c
>
> if there is no such device, dev_get_by_name returns NULL and everything dies.
> Exploiting this is trivial.

Thanks for the report.  This patch should fix them.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Cheers,
--
Visit Openswan at http://www.openswan.org/
Email:  Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
===== drivers/net/eql.c 1.13 vs edited =====

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

into nuts.davemloft.net:/disk1/BK/net-2.6

This contains hpfs fixes from my source ported to 2.6.7 kernel:

updates:
- allocator fragments files less
- OS/2 Warp Server filesystem can be mounted read/only
- added reschedule points so that it doesn't hog CPU

bug fixes:
- filesystem error message when syncing or fsyncing deleted file (or when
  system just writes it on its own)
- filesystem error on extremly fragmented files
- corrupted disk structures could possibly corrupt memory

drivers/message/fusion/mptctl.c:89:24: asm/compat.h: No such file or directory
Signed-off-by: Andrew Morton <akpm@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

This platform is no longer maintained, and its maintainer says that
the hardware is obsolete and out of circulation.

This platform is no longer maintained, and its maintainer says that
the hardware is obsolete and out of circulation.

Patch from Tony Lindgren

Allows translation of shared memory addresses for devices using 
dma-mapping. In some cases the device DMA address is different
from the ARM DMA address, for example with some USB OHCI 
controllers.

For more background information, please see the ARM Linux mailing
list thread "OHCI controller".

Patch from Nicolas Pitre

Let's make it coherent with what the actual code is doing and has
always done, even in 2.4.  Nobody complained about this so let's
just fix the comment.  The most natural usage pattern for this is
a base address and a size so it's more efficient to have an exclusive
end address anyway.

Patch from Ian Campbell

I've seen comments several times that various PXA drivers
update CKEN in an unsafe manner. This patch consolidates
this code into a single function pxa_set_cken() and updates
all the in tree drivers to use it.

Patch from Ian Campbell

The pxafb driver incorrectly allocates 17 u32's for a 16 entry 
pseudo palette.

Signed-off-by: Steve French (sfrench@us.ibm.com)