Based largely upon a patch by Robert Olsson.

Abstract out rtmsg_fib() so that it does not depend
upon fib_hash internal datastructures, move it to
fib_semantics.c
Signed-off-by: David S. Miller <davem@davemloft.net>

ICMP errors may be generated for packets that don't have
all NAT manips applied yet. Verify manips have been applied
before reversing them.
Signed-off-by: Patrick McHardy <kaber@trash.net>

Locally generated ICMP errors never hit PRE_ROUTING. Fixes invalid
addressed ICMP errors for SNATed packets.
Signed-off-by: Patrick McHardy <kaber@trash.net>

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

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

Fixes NAT on loopback.
Signed-off-by: Patrick McHardy <kaber@trash.net>

into kernel.bkbits.net:/home/davem/net-2.6.11

into kernel.bkbits.net:/home/davem/net-2.6.11

into kernel.bkbits.net:/home/davem/net-2.6.11

The 'i' variable in net/socket.c::__sock_create() is not necessary.  It's
have been used to store error codes but there is an 'err' variable already.
Signed-off-by: Luiz Capitulino <lcapitulino@conectiva.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Andrew Hendry <ahendry@tusc.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

If a listening socket sets call user data, ensure it only receives calls
with matching call user data.  Also ensure incoming calls with matching
call user data dont go to another listening socket.
Signed-off-by: Andrew Hendry <ahendry@tusc.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

As previously reported the ArcNet driver didn't work with Preempt and SMB
on.  They do now.  I have changed the locking system from being a global
arcnet lock to being a lock per device.  I used the lock in
dev->hard_start_xmit = arcnet_send_packet.  

Furthermore I added the 'CAP mode' encapsulation.  As far as I see it it is
the only encapsulation which actually makes ArcNet usefull over ethernet. 
Previously, the driver just ignored the hardware transmit status, now you
can get hardware acknowledge and excessive nacks back to userspace via a
raw socket.  The capmode.c is nearly just a copy of arc-rawmode.c.  The
difference is that it inserts a ack_tx() handle into the general driver
framework.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Will be needed for DCCP.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
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>

The patch below adds the ebtables ulog watcher, that sends packets
to userspace. It is based on ipt_ULOG.c.

The complete packet, including Ethernet header, is sent to userspace.
The in and out bridge ports are also sent to userspace. Logging is
of course not restricted to IP packets.
An example of a userspace program that receives and parses packets
sent by the ulog watcher is in the ebtables CVS tree under
examples/ulog/
Signed-off-by: Bart De Schuymer <bdschuym@pandora.be>
Signed-off-by: David S. Miller <davem@davemloft.net>

Some architectures can optimize local_softirq_pending much better than
softirq_pending(smp_processor_id()), and for all others the former is
just a macro expanding to the later.

Also this is the last use of softirq_pending() in common code, once this
is in we can soon kill the notation of beeing able to query other cpus
softirq pending count.
Signed-off-by: David S. Miller <davem@davemloft.net>

After the last patch only three routines are left in this file, but all
of the fir into net/core/dev.c much better:

 - {un,}register_netdev are just wrappers around {un,}register_netdevice
   from dev.c
 - alloc_netdev's counterpart, free_netdev is in dev.c aswell.

So move over the remaining contents and add some kerneldoc comments
describing the functions.
Signed-off-by: David S. Miller <davem@davemloft.net>

This serves two purposes: firstly, we like to allocate page-sized skbs
as this means we zero-copy transfer of network buffers between guest
operating systems. Secondly, it enables us to have a cache of pages
that have been used for network buffers that we can be more lax about
scrubbing when they change VM ownership (since they could be sniffed on
the wire).
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Catalin(ux aka Dino) BOIE <catab at umbrella.ro>
Signed-off-by: David S. Miller <davem@davemloft.net>

As noted by Bartlomiej, this makes the spinlock be a proper lock rather
than just a local lock to each user.
Signed-off-by: Steffen A. Mork <linux-dev@morknet.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When I switched my installation from kernel 2.4 to 2.6 I recognized that
the ISDN module dss1_divert was marked incompilable (config option
CONFIG_CLEAN_COMPILE must be turned off). 

The compile problem was the obsolete using of kernel 2.4 critical
sections.  I replaced the cli() stuff with spinlocks as explained in the
Documentation/spinlocks.txt file.  After that the module compiles and
runs as expected. 
Signed-off-by: Steffen A. Mork <linux-dev@morknet.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

quirk_via_irqpic cannot be __devinit because it runs at
pci_enable_device() time now.

This fixes a boot time crash on a VIA x86-64 machine.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

1) BUG on presence of existing mappings just
   as remap_pfn_range does
2) Perform TLB flush while holding page_table_lock
Signed-off-by: David S. Miller <davem@davemloft.net>

1) Use in_atomic() for atomicity check.
2) Add mmap_sem deadlock on bad kernel access
   prevention just as on i386
3) Use VM_FAULT_* macros instead of magic constants.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

Patch from Ben Dooks

Correct the name used when registering the system
tick interrupt from S32410 to S3C2410.

Signed-off-by: Dimitry Andric

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

Patch from Ben Dooks

Add patch that should have been in 2247/1, defining
CONFIG_S3C2410_LOWLEVEL_UART_PORT

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

It's possible for do_brk() to fail during set_brk() when exec'ing and
a.out.  This was noted with Florian's a.out binary and overcommit set to
0. 

Capture this error and terminate properly.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Florian Heinz built an a.out binary that could map bss from 0x0 to
0xc0000000, and setup_arg_pages() would be unhappt in insert_vma_struct
because the arg pages overlapped.  This just checks before inserting,
and bails out if it would overlap.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jakub Jelinek points out that current fix has an underflow problem
if elf_ppnt->p_filesz == 0.  Fix that up, and also stop overwriting
interpreter buffer, simply check that it's NULL-terminated.

From: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

The patch below makes the following cleanups for code under drivers/mtd/ :
- make some needlessly global code static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

fs/jffs2/gc.c:832: warning: signed size_t format, different type arg 
(arg 3)
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

... and should include it directly rather than hoping it's been done.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>