Patch from Marc Singer

The special case for the Sharp LH processors is unnecessary.  A macro
override makes it cleaner and concentrates the change where it ought
to be.  The default in include/asm-arm/numnodes.h means that only
platforms that care to change the default need to do anything.

Signed-off-by: Marc Singer
Signed-off-by: Russell King

Patch from Ben Dooks

Patch from Shannon Holland
Enable automatic flow control if requested.

Signed-off-by: Shannon Holland

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Patch from Dimitry Andric.
The s3c2410 serial driver selects the opposite parity
mode if parity is enabled.

Signed-off-by: Dimitry Andric

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Patch from Dimitry Andric.
The include/asm-arm/arch-s3c2410/io.h file converts
PC style port addresses to real ARM addresses, and
needs to return an `void __iomem *` to avoid a number
of warnings:
  CC      drivers/ide/ide-iops.o
drivers/ide/ide-iops.c: In function `ide_insw':
drivers/ide/ide-iops.c:49: warning: passing arg 1 of `__raw_readsw' makes pointer from integer without a cast
drivers/ide/ide-iops.c: In function `ide_insl':
drivers/ide/ide-iops.c:59: warning: passing arg 1 of `__raw_readsl' makes pointer from integer without a cast
drivers/ide/ide-iops.c: In function `ide_outsw':
drivers/ide/ide-iops.c:79: warning: passing arg 1 of `__raw_writesw' makes pointer from integer without a cast
drivers/ide/ide-iops.c: In function `ide_outsl':
drivers/ide/ide-iops.c:89: warning: passing arg 1 of `__raw_writesl' makes pointer from integer without a cast
  CC      lib/iomap.o
lib/iomap.c: In function `ioread8_rep':
lib/iomap.c:140: warning: passing arg 1 of `__raw_readsb' makes pointer from integer without a cast
lib/iomap.c: In function `ioread16_rep':
lib/iomap.c:144: warning: passing arg 1 of `__raw_readsw' makes pointer from integer without a cast
lib/iomap.c: In function `ioread32_rep':
lib/iomap.c:148: warning: passing arg 1 of `__raw_readsl' makes pointer from integer without a cast
lib/iomap.c: In function `iowrite8_rep':
lib/iomap.c:156: warning: passing arg 1 of `__raw_writesb' makes pointer from integer without a cast
lib/iomap.c: In function `iowrite16_rep':
lib/iomap.c:160: warning: passing arg 1 of `__raw_writesw' makes pointer from integer without a cast
lib/iomap.c: In function `iowrite32_rep':
lib/iomap.c:164: warning: passing arg 1 of `__raw_writesl' makes pointer from integer without a cast

Signed-off-by: Dimitry Andric

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

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

Patch from David Vrabel

Use some #define'd constants in the ixp4xx's arch_reset().

Signed-off-by: David Vrabel
Signed-off-by: Russell King

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

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

Use netdev_priv() and get rid of the PRIV() macro by using the correct
data element. Also eliminate casts, where type is correct.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

When the skfddi driver was converted to the new PCI netdevice interface,
it never got tested with real hardware. The initialization got broken, this
should fix it.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Fixes instances where gfar_read() was invoked in debug codewith a value,
rather than a pointer.
Signed-of-by: Andy Fleming <afleming@freescale.com>
Signed-of-by: Kumar Gala <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

From: Steven Rostedt <rostedt@goodmis.org>

If the transmit buffer of the e100 overflowed, then the system would hang.
This was caused because the e100 driver would stop the queue, and
netpoll_send_pkt in netpoll.c would then loop forever.  This is because the
e100 net_poll would never start the queue again after the transmits have
completed.

For those that use the e100 and netconsole, all you need to do is a sysreq
't' to lock up the system.
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Fixes breakage in getting MAC address on built-in tulip in
alphastation 200 - without delay we are skipping bytes.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

This patch adds the Intel ICH7R DID's to the ahci.c SATA AHCI driver
for ICH7R SATA support.
Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

into silver.ucw.cz:/home/vojtech/bk/dmitry

Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       changing HID->event mappings (via EVIOCS*) in the future and make 
       debugging easier now.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       rebooting.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       good idea to discard any character other than ACK/NAK during probe
       it causes missing releases and keys getting "stuck" when a command
       issued on enabled device. The effect is easily demonstrated with
       the following command:
           while true; do xset led 3; xset -led 3; done

       With this change extra characters will be discarded only if device
       has not been marked as "enabled" yet.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 

into silver.ucw.cz:/home/vojtech/bk/input

looking at ext3_xattr_block_set() [fs/ext3/xattr.c] ...
I see that

                                error = -EDQUOT;
                                if (DQUOT_ALLOC_BLOCK(inode, 1))
                                        goto cleanup;

allocates a quota block, but right after that several
error echecks happen ...

                                if (error)
                                        goto cleanup;

and I don't see any DQUOT_FREE_BLOCK() in the errorpath

cleanup:
        if (ce)
                mb_cache_entry_release(ce);
        brelse(new_bh); 
        if (!(bs->bh && s->base == bs->bh->b_data))
                kfree(s->base);

        return error;

I'd suggest the attached fix.
Acked-by: Jan Kara <jack@suse.cz>
Acked-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Nicolas Pitre

This enables audio on Mainstone with the ALSA PXA2xx AC97 driver.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

Patch from Ben Dooks

All the headers refer to debug-armv.S, when they where split from
debug.S

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

the calls _find_first_zero_bit_be() and _find_next_zero_bit_be()
are missing const from the pointer argument passed in, causing
several build warnings when building an ARM kernel in big-endian
mode.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

The change to kbuild to use -isystem `gcc -print-file-name=include`
broke our parisc crosscompile (and presumably everyone else's).

The reason is that you have a := in the NOSTDINC_FLAGS rule, which is
evaluated in situ (i.e.  before we've had a chance to set CROSSCOMPILE
on CC) so the gcc include path is actually the native one not the
crosscompiler one.  On parisc this causes us to be unable to handle
_builtin_va functions, but I bet there are a heap of other problems. 
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch removes an annoying problem in xfrm_user.  As it is every
time an SA is added it probes every known algorithm in the universe.
Now if they all existed it would be OK.  However, for the ones which
don't actually exist this causes multiple /sbin/modprobe processes to
be spawned which slows the system down when you're adding hundreds of
SAs.

Since we know the type of algorithm required when we're adding a new
SA, we can get away with only probing the selected algorithms.  This
is what the following patch does for xfrm_user.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

But as stated in bonding.txt, the ARP monitor requires the underlying
driver to update dev->trans_start and dev->last_rx.

The patch below adds the required functionality to the TUN/TAP driver.
Please test if this helps in your case.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

From: Matt Mackall <mpm@selenic.com>

This avoids a nasty NAPI race by checking that work was actually scheduled
for the CPU netpoll is running on and pulls the NAPI-specific code out into
a separate function.

Original idea from Jeff Moyer
Tested by Andrew Tridgell
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Andreas Schwab <schwab@suse.de> points out that the ipt_conntrack
match exposes struct

Ian Kumlien reported that new NAT code started sending out DCC
requests with 0 as the IP address.  That prompted me to write a simple
IRC test case, which both illustrated the bug, and found another one
in that the wrong expectation was being set up when NAT occurred.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>