into nuts.ninka.net:/home/davem/src/BK/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

Patch from Steven Cole.

Here are some spelling fixes for arm.
This was diffed against the current 2.5 tree.

Patch from Eli Carter

# Mon Apr 21 11:11:41 CDT 2003 ejc@rnd-linux-c84
# use-physoffset-define
#
# Use the PHYS_OFFSET #define instead of a hard-coded value.
#
# Diffed against linux-2.5.67-rmk1+1501-3+1506
#
#  arch/arm/boot/compressed/head-xscale.S |    2 +-
#  1 files changed, 1 insertion(+), 1 deletion(-)
#

Patch from Eli Carter

# Mon Apr 21 11:20:06 CDT 2003 ejc@rnd-linux-c84
# pci-io-mem-size-defines
#
# Rename the IOP321_PCI_WINDOW_SIZE #defines to use
# IOP321_PCI_{IO,MEM}_{BASE,SIZE} instead.  This makes the #defines a bit more
# consistent.  No functional change, though it does bring up the question of
# whether res[].end should be BASE+SIZE-1 or BASE+SIZE.
#
# Diffed against linux-2.5.67-rmk1+1501-3+1506+1508-10
#
#  arch/arm/mach-iop3xx/iop321-pci.c    |    8 ++++----
#  include/asm-arm/arch-iop3xx/iop321.h |   10 ++++------
#  2 files changed, 8 insertions(+), 10 deletions(-)
#

Patch from Eli Carter

# Thu Apr 17 16:37:58 CDT 2003 ejc@rnd-linux-c84
# iq80321-use-addr-defines
#
# Use #define's instead of hard-coded numbers for the device locations for the
# iq80321 board.
#
# Diffed against linux-2.5.65-rmk1+1472-4+1502-3+1506
# Applies cleanly to linux-2.5.67-rmk1+1502-3+1506
#
#  arch/arm/mach-iop3xx/mm-321.c |    4 ++--
#  1 files changed, 2 insertions(+), 2 deletions(-)
#

of Intel CPU optimizations. From Andi Kleen.

This implements automatic code patching of memory barriers based
on the CPU capabilities. Normally lock ; addl $0,(%esp) barriers
are used, but these are a bit slow on the Pentium 4.

Linus proposed this a few weeks ago after the support for SSE1/SSE2
barriers was introduced. I now got around to implement it.

The main advantage is that it allows distributors to ship less binary
kernels but still get fast kernels. In particular it avoids the
need of a special Pentium 4 kernel.

The patching code is quite generic and could be used to patch
other instructions (like prefetches or specific other critical
instructions) too.
Thanks to Rusty's in kernel loader it also works seamlessly for modules.

The patching is done before other CPUs start to avoid potential
erratas with self modifying code on SMP systems. It makes no
attempt to automatically handle assymetric systems (an secondary
CPU having less capabilities than the boot CPU). In this
case just boot with "noreplacement"

The VMA merging code can merge vmas which have a ->vm_ops->close() handler.
But this means that per-VMA resources in one of the merged VMAs will not be
freed.

Fix that up by just refusing to merge any VMA's which look "complex": they
have special flags set or they have a ->close handler.

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

Here is a trivial fix for task_prio() in the case MAX_RT_PRIO !=
MAX_USER_RT_PRIO.  In this case, all priorities are skewed by
(MAX_RT_PRIO - MAX_USER_RT_PRIO).

The fix is to subtract the full MAX_RT_PRIO value from p->prio, not just
MAX_USER_RT_PRIO.  This makes sense, as the full priority range is
unrelated to the maximum user value.  Only the real maximum RT value
matters.

This has been in Andrew's tree for awhile, with no issue.  Also, Ingo
acked it.

Ok, now that most drivers have been converted to the new
irqreturn_t, we can remove the fascist type-checks and just
use a regular integer type which has a simpler calling
convention.

With suggestions from Chritoph Hellwig

- Remove MODULE_USE_COUNT macros
- Add owner member to struct tty_ldisc
- Init tty_ldisc at compile time
- make some functions static

- Remove MODULE_USE_COUNT macros
- Add owner member
- Add tiocmget/tiocmset tty callbacks

- Remove MODULE_USE_COUNT macros
- Add owner member
- Add tiocmget/tiocmset tty callbacks

- Remove MODULE_USE_COUNT macros
- Add owner member
- Add tiocmget/tiocmset tty callbacks

- New irq handler prototypes.
- Lots of un-enumurated locking fixes/cleanups (thanks in large part to
  spinlock debug compile options in the kernel).
- Other various trivial fixes.

somebody else.

This converts the Alpha architecture to the new IRQ API.  Tested on
Jensen.

into home.transmeta.com:/home/torvalds/v2.5/linux

Update hotplug and pcmcia drivers to the new IRQ API.

Update the input and joystick drivers to the new IRQ API.

Update ISDN for the new IRQ API.

Update the IRDA drivers to the new IRQ API.

spin_lock() does not take a spinlock_t**

parport_serial is calling a couple of 8250 driver functions with no prototypes
in scope.

Turns out it was calling them with too many args, too.

Update 1394 to the new IRQ API

Update video drivers to the new IRQ API.

Almost none of them compile, so it was done on-spec.

Update a couple of media drivers to the new IRQ API.

Some stuff in there doesn't link btw:

drivers/built-in.o: In function `rds_waitread':
drivers/built-in.o(.text+0x6c152): undefined reference to `aci_port'
drivers/built-in.o: In function `rds_rawwrite':
drivers/built-in.o(.text+0x6c1a3): undefined reference to `aci_port'

Fix up a bunch of char drivers for the new IRQ API.

Update the watchdog drivers to the new IRQ API.

Also, give a couple of irq handlers static scope.