Two bugs here:

1) The return value of strchr("foo",0) should be the start address of
   "foo" + 3, not NULL.

2) Since the second argument for strchr() is defined as an int, some
   characters such as 'é' might validly end up to be the value -23 due to
   signedness issues.  Corectly handle those.

The return value from ptrace_set_bit() is never used.  This cset
makes it a void function.

This removes some minor differences between Linus' tree and the main
ARM tree; comment clarification and some weird formatting.

This keeps ARM in line with the continued transition to the input
layer.

Hi,
  I believe the comment in the nwfpe fpopcodes is slightly wrong -
although a 2nd pair of eyes on this would be a good idea.

Hi,
  For reasons of great complexity I found out the hard way that the
kernel must (and does) zero the pad sections in the stat structures.
Here is a comment that states this for the next person who needs to
know.

This allows the FP module to perform some extra optimisations.

Update for changes in mainline 2.5.3[01234].

We need the initrd location before the normal command line parsing
occurs so we can reserve the right bits of memory, and not double-
free the initrd during userspace boot.

This solves a problem whereby the generic interrupt code repeatedly
called an interrupt handler, even though the interrupt handler had
called disable_irq().

Question: is there any reason to do all this with byte access rather than 
word access besides alignment issues?  Word access would be much faster.

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

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

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

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

into zephyr.physics.uiowa.edu:/home/kai/src/kernel/v2.5/linux-2.5.make

Greg Banks:

A very significant space is missing from an "if" expression
in drivers/video/Config.in.

Greg Banks:

Symbols CONFIG_BLK_DEV_NS87415, CONFIG_BLK_DEV_TRM290, CONFIG_DSCC4, and
CONFIG_USB_SERIAL_SAFE_PADDED had spurious (EXPERIMENTAL) tags in their
banners.
Symbol CONFIG_INPUT_UINPUT was missing an (EXPERIMENTAL) tag in it banner.

The mips and parisc ports both defined 'Loadable module support' menus,
despite including an identical menu from init/Config.in.

Greg Banks:

The symbol CONFIG_SOUND_CMPCI_FMIO is declared with a "hex" statement,
immediately preceded by a "define_hex" with the same value as the
default value from the "hex".  In config and xconfig, this has no effect;
in menuconfig it prevents the user selecting any value other than the
default.

Greg Banks:

The symbol CONFIG_DEBUG_SPINLOCK was defined twice identically
in the same file...three lines apart.

Greg Banks:

A number of dep_bools and dep_tristates have architecture constants
(e.g. CONFIG_X86) as dependencies.  Such symbols have the property
that their value is constant for any particular arch tree, and is
either "y" or "", neither of which have any effect as dependencies,
so the dependencies have no effect.  This patch removes some of them.

Greg Banks:

The menu 'AX.25 network device drivers' contained as its first
item a comment with identical banner.  This is pointless duplication,
but more to the point it confused gcml2 unnecessarily.

Cset exclude: torvalds@home.transmeta.com|ChangeSet|20020821235957|57282

This patch simply ensures that 'setting the MTRR' is atomic.  This is
important since HT CPU's may share some MTRR state.

- Do not use PC-relative branch/call in Ultra-III+ parity error
trap vectors, we patch this into the trap table and then the PC-relative
values are wrong.
- When we take an irrecoverable trap at tl > 0, save away the full
trap stack to the kernel stack, then log it from the C code handler.

- Some places need to include sched.h because the already include ptrace.h
- CLONE_{SET,CLEAR}TID support
- Clear PT_DTRACE when execve succeeds.
- Add security bits to ptrace
- Add sys_security to syscall tables.

- Some places need to include sched.h because the already include ptrace.h
- CLONE_{SET,CLEAR}TID support
- Clear PT_DTRACE when execve succeeds.
- Add security bits to ptrace and sys32_execve
- Add sys_security to syscall tables.

- futex uses int as its atomic word type, we pass in user_tid
to the futex routines, so the types must match

- flush_dcpage_cheetah sized wrongly, it is 11 not 9 insns now
- xcall_report_regs and xcall_promstop should use etrap_irq not etrap

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

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