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

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

There's an issue with bio_uncopy_user() in that it expects ->bv_len to
be untouched from io submission to io completion, which it wont be for
some transfer lengths on some hardware. So we end up not copying all the
data back to user space, not so good. This patch adds a bio_map_data
local structure to track the io_vec.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

fixes two deadlocks when near-full and fixes a 4KSTACKS problem in XFS.

SGI Modid: xfs-linux:xfs-kern:19600a
Signed-off-by: Nathan Scott <nathans@sgi.com>

Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:179634a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:179624a
Signed-off-by: Nathan Scott <nathans@sgi.com>

projinherit flag.

SGI Modid: xfs-linux:xfs-kern:179567a
Signed-off-by: Nathan Scott <nathans@sgi.com>

writing pages.

SGI Modid: xfs-linux:xfs-kern:179566a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:179137a
Signed-off-by: Nathan Scott <nathans@sgi.com>

routines fail.

SGI Modid: xfs-linux:xfs-kern:178890a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:178673a
Signed-off-by: Nathan Scott <nathans@sgi.com>

excl vs shared).

SGI Modid: xfs-linux:xfs-kern:178671a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:178670a
Signed-off-by: Nathan Scott <nathans@sgi.com>

Move local version put in tcp_diag.c into time.h
where it belongs.  Also, make it smarted about HZ
values math.

Based upon suggestions from Joe Perches <joe@Perches.com>
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

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

Westwood code cleanup;
	* use const.
	* avoid needless paren's and returns
	* inline acked_count (called once)
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Enhancement to tcp diagnostics used by ss command.
* use jiffies_to_usecs/msec instead of hardcode math
* report bandwidth for Westwood
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

The choice of congestion algorithm needs to be made when connection
is setup to avoid problems when the sysctl values change later and the
necessary data hasn't been collected.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>'

Signed-off-by: David S. Miller <davem@davemloft.net>

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

be before the end of the vmdb, just make sure it is not out of bounds.
If it is abort.  If it is not just continue happily.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

The reordering of the drivers in drivers/video/Makefile introduced a
stray 0 into the pxafb.
Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into coreworks.de:/home/kaber/src/nf/netfilter-2.6

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>

The "DART" iommu used on Apple U3 chipset will appear into 3rd party
products soon, thus the code shouldn't be named "pmac_*" anymore.

Also, the explicit config option is no longer needed, there is no
reason to build a PowerMac kernel without the iommu support, and
it can always be disabled at runtime with a cmdline option for
testing or debugging.

This patch do the appropriate renaming and makes the config option
implicit & selected when pmac support is included.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

include/asm-ppc64/systemcfg.h defines a structure that currently gets
exposed to userland via /proc, and which I intend to deprecate in the
near future once I have better alternatives available.

In the meantime, this patch removes a bunch of stuff from this file that
were only defined for non-__KERNEL__, like an inline function for
getting to that struture via /proc, and some CPU & platform type
definitions that were duplicates of the ones in asm-ppc64/processor.h.
These things have nothing to do in a kernel header.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

A small spelling error slipped into a new ppc_md. platform call I added
in my last patch. Not very problematic but worth fixing before any code
using the new call gets pushed.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There appears to be one case missing from the wait_event() family - the
uninterruptible timeout wait.  The following patch adds this.

This wait is particularly useful when (eg) you wish to pass work off to an
interrupt handler to perform, but also want to know if the hardware has
decided to go gaga under you.  You don't want to sit around waiting for
something that'll never happen - you want to go and wack the gremlin which
caused the failure and retry.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>