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

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

Patch from Ben Dooks

Missed protection for use when this file is included for .S files

Signed-off-by: Ben Dooks 

Patch from Nicolas Pitre

It's a rather bad idea to have psa-regs.h included all the time.
It's rather large and likely to create namespace clashes, as well
as slowing down the build unnecessarily.

Better include it explicitly where it is actually needed.

Signed-off-by: Nicolas Pitre 

Patch from Ben Dooks

platform data header for use with on-chip NAND flash
controller.

Signed-off-by: Ben Dooks 

Patch from Nicolas Pitre

Let's move GPIO setup into the board specific hw init functions.

The PXA2xx often has many different GPIOs that can be used for
a given alternate function and the good one to use is hardware
dependent.  For example, Lubbock and Mainstone are not using all
the same GPIOs for PCMCIA signals.

Signed-off-by: Nicolas Pitre 

Patch from Nicolas Pitre

Patch from Nick Bane.
Needed to fix problems with PCMCIA driver.
Signed-off-by: Nicolas Pitre 

Patch from Dave Jiang

Signed-off-by: Dave Jiang (dave.jiang@gmail.com)

Remove the code that jumps to physical offset in head-xscale.S for IOPs that was fixing a legacy redboot problem. The issue no longer exists it seems and it's breaking the compilation anyways. Removed.

Patch from Dave Jiang

This fixes compile error where u32 was not recognized by iop321.h and iop331.h. Started showing up in 2.6.9-rcX that wasn't there in 2.6.8.1. 
Added include of <asm/types.h> to asm/arch/hardware.h where it would propogate to both headers. 

Signed-off-by: Dave Jiang (dave.jiang@gmail.com)

Patch from Nicolas Pitre

At least gcc-3.4.1 complains about puts() declaration conflicting
with its own idea of it.  Our puts() declaration and implementation
isn't standard anyway, so let's rename it to putstr() like on x86.

Signed-off-by: Nicolas Pitre 

Fixes a warning in kernel/compat.c.
Signed-off-by: Randolph Chung <tausq@debian.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1) If tcp_{sendmsg,sendpage} tacks on more data to an
   existing SKB, this can make tso_factor inaccurate.
   Invalidate it, which forces it to be recalculated,
   by simply setting it to zero.
2) __tcp_trim_head() changes skb->len thus we need
   to recalculate tso_factor
3) BUG check that tcp_retrans_try_collapse() does not
   try to collapse packets with non-1 tso_factor
4) The Solaris FIN workaround in tcp_retransmit_skb()
   changes packet size, need to fixup tso_factor
Signed-off-by: David S. Miller <davem@davemloft.net>

A disconnected dentry can hold an inode active after the last link has
been removed.  The file will not then be truncated and removed until
memory pressure flushes the disconnected dentry from the dcache.

This problem can be resolved by making sure that an inode never has
both a connected and a disconnected dentry.

This is already the case for directories (as they must only have one
dentry), but it is not the case for non-directories.

This addresses it by:
 - changes d_alloc_anon to make sure that a new disconnected dentry is
   only allocated if there is currently no (hashed) dentry for the
   inode. (Previously this would noramlly be true, but a race was
   possible).
 - changes d_splice_alias to re-use a disconnected dentry on
   non-directories as well as directories.
 - splits most of d_find_alias out into a separate function to make
   the above easier.

Problem originally reported by Nikita Danilov.

Acked by Al Viro ("It looks sane"), and Jakob Oestergaard reports this
fixes his problems. Further pushed by Christoph Hellwig.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

People don't build UP very often it seems ... anyways, it was broken,
here is the fix.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The current code allocating the DART has a couple of bugs, first
it's called on all machines including the ones who have no DART
(oops), and then it tries to access the device-tree using the
"of_chosen" pointer before it was initialized.

The enclosed patch fixes these.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Looks like we never needed them, since that bug has been there forever,
I didn't get the right base for the IO cycles on the G5 host bridge
in the first place (I probably misinterpreted some OF forth code or
something like that).

No problems reported other than Linus typo in an unbuildable driver from
the last one.

This one adds tty_ldisc_flush and also makes tty_wakeup do the queue
wake as discussed with Paul.  I've then propagated these functions
through all the drivers.  This means most drivers don't know about the
ldisc locking and instead call generic functions that look after it. 
The result is the removal of a lot of duplicate code both for ldisc
referencing and historical code for handling tty ldisc wakeup semantics.

A nice side effect is that by adding versions of the two helpers we can
switch most of the drivers over before changing the core tty code if
preferred.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Silly thinko/typo, it needs to check the newly allocated memory for
failure of course. Noticed by Stefan Meyknecht.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

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

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

This fixes the non-functional PCMCIA problem reported on LKML
by Dax Kelson.

Signed-off-by: Russell King

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

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

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

Also s/FN_S_ACCESSED/FA_S_ACCESSED/
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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>