Based upon patches and commentary from Thomas Spatzier,
Stephen Hemminger, and Andi Kleen.

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

validate ids of associations.

This patch avoids the use of virt_addr_valid() to validate the address
of associations passed by the user. Currently the address of an
association is used as its id. virt_addr_valid doesn't work as
expected when PAGEALLOC debugging is enabled.

only the receive specific fields of sctp_sndrcvinfo.

Networking support/options and Networking drivers have been, uhm,
messy to navigate for some time now.   BenH mentioned this
and I was already looking into options to clean it up.

This is a cleanup of Networking support/options and Networking Drivers.
It presents a more consistent interface and lists similar driver
groups and protocol groups closer together.
It also moves the IBMVETH driver so that it no longer breaks the
dependency tree, allowing other drivers (nearby in Kconfig file)
to be presented in a more linear manner.

We default to "long" (which is what POSIX says), but since
a number of architectures have used "int" for historical
reasons, we need to allow overrides.

At least sparc64 needs this. Possibly others, but so far
architecture maintainers haven't spoken up. ppc64 and x86-64
are known to be ok with the default "long".

From Ivan Kokshaysky <ink@jurassic.park.msu.ru>.

into heffalump.twiddle.home:/home/rth/work/linux/axp-2.6

From: Matt Porter <mporter@kernel.crashing.org>

Patch fixes a latent bug in the PPC44x tlb management code.

From: Matt Porter <mporter@kernel.crashing.org>

Make a couple 4xx defconfigs functional again.

From: Matt Porter <mporter@kernel.crashing.org>

IDs new PPC44x silicon.

From: Matt Porter <mporter@kernel.crashing.org>

Patch fixes the build for PPC40x platforms.

From: Tom Rini <trini@kernel.crashing.org>

When I was updating ppc/boot/simple/relocate.S to work on PPC_PREP systems, I
in advertantly broke 4xx systems.  On classic PPC, the first three
instructions are nops, of which the first two can be overwritten.  This is
not true of 4xx (or 8xx, but that's not working right now anyhow).  The
following is needed to fix this.

The commoncap module calls this.

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

- Use -march=armv6 where available.
- CFLAGS_BOOT isn't needed - the decompressor uses CFLAGS, remove it.
- PROCESSOR is never used, remove it.
- LDFLAGS_BLOB is never used, remove it.
- Remove MACHINE macro.
- Correct comments for include/asm-arm/.arch target.
- Copy format of include/asm symlink rule.
- Arrange for configuration to be split before making
  include/asm-arm/arch symlink.
- This means that asm-offsets.s no longer depends on
  include/config/MARKER.

diva_os_cancel_soft_isr() may not call tasklet_kill(), because it is
interrupt context.  This will be done correctly in the cleanup function
anyway.

The patch to check "maxcpus=N" early broke by putting maxcpus (a
variable which is only exported by mpparse.c) into
parse_cmdline_early().

The fix is to make it depend on the correct CONFIG_ option. 

In the subarchitectures:

CONFIG_X86_SMP is the one that means "I want standard x86 smp code" and
that's what this should depend on.

This patch from Christoph Hellwig does much welcomes cleanup of
the old mac53c94 and mesh SCSI drivers, removing sillycaps etc...

From: Sam Ravnborg <sam@ravnborg.org>

Fix this:

 	  Building modules, stage 2.
 	  MODPOST
 	LANG := en_US.UTF-8
 	make: LANG: Command not found
 	make: *** [all] Error 127

by removing the tab in front of the LANG assignment.

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

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

Bridge code is limited to 256 ports per bridge because the Spanning
Tree Protocol has limit of one octet for port number.  This code
fixes:
	* bogus unlock in error path when port list is full.
	* passes different error status for out of memory, vs
	  port list full.
	* O(n) vs O(n^2) lookup for free port number
	* since port and priority are both limited to one byte
	  don't store them as int's
	* makes limit explicit in code

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

This fixes a problem in sys_swapon that can cause the creation of invalid
swap ptes.  This has its cause in the arch-independent swap entries vs. 
the pte coded swap entries.  The swp_entry_t uses 27 bits for the offset
and 5 bits for the type.  In sys_swapon this definition is used to find how
many swap devices and how many pages on each device there can be.  But the
swap entries encoded in a pte can be subject to additional restrictions due
to the hardware besides the 27/5 division of the bits in the swp_entry_t
type.  This is solved by adding pte_to_swp_entry and swp_entry_to_pte calls
to the calculations for maximum type and offset.

In addition the s390 swap pte division for offset/type is changed from 19/6
bits to 20/5 bits.

Two callsites, 48 bytes saved

Two callsites, 456 bytes saved