into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

into cantab.net:/home/src/ntfs-2.6

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

      typed enums.  This completes the sparse annotations in NTFS.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

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>

into cantab.net:/home/src/ntfs-2.6

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

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

into flatcap.org:/home/flatcap/backup/bk/ntfs-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>