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

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

Patch from Ben Dooks

Added code to remove the serial ports registered when
the module is unloaded.

Cleaned up ifdef'd code, and added copyright header

Signed-off-by: Ben Dooks 

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

Patch from Ben Dooks

Fixed bug where wrong bits where being masked in the
configuration registers for the GPIO pins

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Fix IRQ number for USB over-current on Simtec BAST

Signed-off-by: Ben Dooks 

Patch from Catalin Marinas

On ARM926EJ-S, the "always assume write" for Jazelle data aborts
causes Java code exit with segmentation fault every time it tries
to access a read-only page. This patch puts some restrictions on what 
can be done in the Jazelle state but it allows it to run.

Signed-off-by: Catalin Marinas 

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

From: <janitor@sternwelten.at>

Remove unnecessary cs_to_timeout() macro.  Use msleep() instead of
schedule_timeout() to guarantee the task delays for the desired
time.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Fix NAT helper code to update TCP window tracking information
if it resizes payload (and thus alrers sequence numbers).

This patchlet was somehow lost during 2.4.x->2.6.x port of TCP 
window tracking :(
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

We recently changed the VSID allocation on PPC64 to use a new scheme
based on a multiplicative hash.  It turns out our choice of multiplier
(the largest 28-bit prime) wasn't so great: with large contiguous
mappings, we can get very poor hash scattering.  In particular earlier
machines (without 16M pages) which had a reasonable about of RAM (>2G
or so) wouldn't boot, because the linear mapping overflowed some hash
buckets.

This patch changes the multiplier to something which seems to work
better (it is, rather arbitrarily, the median of the primes between
2^27 and 2^28).  Some more theory should almost certainly go into the
choice of this constant, to avoid more pathological cases.  But for
now, this choice fixes a serious bug, and seems to do at least as well
at scattering as the old choice on a handful of simple testcases.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The two patches below (compile)fix some fall-out from the tty cleanups.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Move extern declarations of ia64_{reg,unreg}_MCA_extension()
to mca.h.  Delete declaration of ia64_mca_ucmc_other_recover_fp()
which doesn't exist.

Patch supplied by Hidetoshi Seto.
Signed-off-by: Tony Luck <tony.luck@intel.com>

This is the latest/Updated OS_MCA handler which try to do recovery
from multibit-ECC/poisoned memory-read error on user-land.
(Thank you very much for comments, Keith and Grant!)

I'd still appreciate it if anyone having good test environment
could apply my patch and could report how it works.
(especially reports on non-Tiger/non-Intel platform are welcome.)
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

change the return value of PFM_CREATE_CONTEXT from
EAGAIN to ENOMEM when the sampling buffer size is
larger than the RLIMIT_MEMLOCK limit of the task.
signed-off-by: Stephane Eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

fix a problem in pfm_check_task_state() and pfm_task_incompatible()
which was caused by the introduction of the new TASK_TRACED state.
Tool would fail to attach to a process,i.e., PFM_LOAD_CONTEXT would
fail. With the fix perfmon now accepts to operate on tasks which are
in either TASK_STOPPED or TASK_TRACED state. The problem was tracked
down by Alex Williamson from HP who also submitted the patch.
signed-off-by: Stephane Eranian <eranian@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

Patch from Ian Campbell

Patch 2113 broke drivers/char/watchdog/sa1100-wdt.c on SA1100.

Signed-off-by: Ian Campbell 

Patch from Ian Campbell

The include of asm/arch/pxa-regs.h has been removed from
asm-arm/arch-pxa/hardware.h and now needs to be included
from the relevant files. 

I have verified the fixes to arch/arm/mach-pxa/sleep.S and 
drivers/char/watchdog/sa1100_wdt.c myself. My local tree
has other changes to include/asm-arm/arch-pxa/serial.h
but I beleive that the attached is necessary and correct.

Signed-off-by: Ian Campbell 

Some dual use type errors still exist, where the
bios mapping is type-confused.

We can just use skb_shinfo(skb)->tso_{segs,size}
directly.  This also allows us to kill the
hack zone code in ip_output.c

The original impetus for thus change was a problem
noted by John Heffner.  We do not abide by the MSS
of the connection for TCP segmentation, we were using
the path MTU instead.  This broke various local
network setups with TSO enabled and is fixed as a side
effect of these changes.
Signed-off-by: David S. Miller <davem@davemloft.net>

This allows control over what percentage of
the congestion window can be consumed by a
single TSO frame.

The setting of this parameter is a choice
between burstiness and building larger TSO
frames.
Signed-off-by: David S. Miller <davem@davemloft.net>

A few one-liners removed hundreds of lines of warnings.
The driver was clean, just not using the proper types.

It was almost correct, apart from some silly details.

The x86 ROM probing is still wrong, and doesn't use the proper
PCI MMIO accessor functions. Sparse (correctly) warns about
it.

Remove absolutely tons of totally unnecessary casts,
once the types are done right in the first place.

The driver is still ugly as hell and needs some serious
indentation fixing, but this makes it not spew hundreds
of warnings any more.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We register it with the ACPI layer, and it's alive long
after init.

Noted by Bjorn Helgaas.

Only recently digitized for our edification.

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

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

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

Basic cleanup - replace untyped/wrongly typed "dev->base_addr" with
use of a strongly typed "ioaddr".

Fixed up resulting mii_delay() search-and-replace error noticed by
Andrey Klochko.

Verified by Franz Pletz.