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

Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

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

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

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

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

Found running netfilter code under valgrind: we return some
uninitialized stack to userspace (needs root).  Almost certainly
harmless, but this suppressed the valgrind complaint, and
doesn't hurt.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

The fix to find_appropriate_src left a stupid test, which has no
effect but is incoherent at best.  It covers a corner case: if a
previous connection from this source was mapped onto a different IP
address (because it was explicitly told to), should the next one be
mapped that was as well, if no explicit rule says to remap the src IP?

I think the answer is yes: unless the user explicitly tells us to map
into a particular range, we should follow the Kegel draft.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

While doing the 2.4 version of the netlink patch, I noticed a bug
in my mc_list code.  First of all it wasn't holding the table lock
when adding nodes to the list.  It also didn't take the node off
the list when multicast is switched off.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Make sure loopback_dev, if up, has the ipv6 bits
for it setup before the addrconf netdev notifier
is registered.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

The patch was wrong.  Back it out, and add some commentary explaining why we
need to run queue_me() prior to the get_user().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Get the sizes right, and thus avoid complaints about big constants etc.

missing extern declaration in -Werror land...  Add the proper
declaration to sysrq.h.

asked for it.

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

Patch from Ben Dooks

Update the s3c2410 machines for the new serial handling,
as well as add the clock sources the bast and vr1000
rely on.

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

Patch from Ben Dooks

Update the arch/arm/mach-s3c2410 core files for the
new serial port bits, and fix the bugs with s3c2440
handling.

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

Patch from Ben Dooks

Clock code now uses the supplied device to check for
the id of the clock, so uart clocks are now simply
"uart" instead of "uart0", "uart1" and "uart2"

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

Move ColdFire 5282 based senTec board startup code to the common
528x directory.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Include the 527x and 528x family SIM module hardware definitions in the
generic SIM include. All ColdFire specific code just includes the generic
sim include without regard to which actuall ColdFire family member we
are compiling for.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add ColdFire 528x specific CPU reset code.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Kernel startup code specific to the ColdFire 5272 based Feith
SACLES board.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Update PIT timer comments to reflect the fact that it is also used
in the new ColdFire 527x family of processors.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Move definition of kernel stack size so that asm files can use it.
Patch submitted by Philippe De Muyter <phdm@macqel.be>.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add support for the 527x ColdFire family, and change the 5282
support to be the generic 528x family in ColdFire DMA support
defines.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add conditional support for the 527x and 528x UART hardware to the common
ColdFire serial port header.
Signed-off-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

Mark deadline_init and deadline_exit as init and exit functions, and
make them static.
Signed-off-by: Chris Wright <chris@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mark cfq_exit function as and exit function, and make it static.
Signed-off-by: Chris Wright <chris@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mark as_init and as_exit as init and exit functions, and make them static.
Signed-off-by: Chris Wright <chris@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This box crashed at startup today and I noticed that some modules will
need to have assign_irq_vector() available although it is marked as
__init.

Looks like it was done for i386 in but not x86_64...
Signed-off-by: Alexander Nyberg <alexn@dsv.su.se>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>