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

  - ISA PnP - removed isapnp_card_protocol reference
  - NE1000/2000 - fixed exit sequence and bugs in PnP code
  - aironet4500 - fixed exit sequence
  - ISDN - hisax_fcpcipnp - fixed compilation
  - OSS sound drivers - ad1848, cs4232 - updated to latest PnP code

As you mentioned, we do not correctly identify the P4-based Celeron in
the kernel configuration help.  Unfortunately, Intel has called all
Celeron products simply "Celeron", so we call these "P4-based Celerons".

Check for PnP BIOS in all fault paths, not just in do_trap().

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

into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

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

A couple of occurrences of struct free_pte_ctx in include/asm-ppc/tlb.h
got missed in akpm's patch - this fixes them.

copy_from_user is supposed to transfer as much data as is
valid and then to return the number of bytes not tranferred.
That's how it works on x86.  On ppc it can be as much as 15
bytes short.

I initially saw the problem with the mount system call.

Note that the fifth argument to mount is an address 8 bytes from the end
of user data space.  There is a null byte at that address, since no mount
options are being passed.

In the kernel, sys_mount() allocates a page for the options and
does copy_from_user(new_page, 0x1005eff8, PAGE_SIZE).  copy_from_user
should copy 8 bytes and return (PAGE_SIZE-8).  Instead, on ppc it reads
8 bytes, faults, writes no bytes, and returns PAGE_SIZE, which causes the
EFAULT to be erroneously reported.

into samba.org:/home/paulus/kernel/for-linus-ppc

- Make sure R9 is really loaded
- Make sure IS_CONS flag is handled properly.

- use /* */ instead of //
- change my mail alias
- remove MOD_DEC_USE_COUNT and MOD_INC_USE_COUNT
- use try_module_get (and check result) and module_put instead of
  __MOD_INC_USE_COUNT and __MOD_DEC_USE_COUNT
- add \n in init/exit messages

Here is the s390x part. Others will go through the respective maintainers.

This patch creates compat_sys_statfs and compat_sys_fstatfs. This is just
the generic part of the patch. Specific archs will follow.

Since these are just symbols in the module object, they need symbol name
munging to find the symbol from the parameter name.

strlen_user returns 0 on error, not an error number, and otherwise
returns the length including the NUL byte.  Found by Andi Kleen.

Russell's patch beat mine in, and unfortunately didn't conflict, so
armv has two __gpl_ksymtab sections.

Revert mine.

Add ptrace support for getting and setting the THREAD_AREA of the
thread being debugged on x86.

Explicitly place the __gpl_ksymtab section for every arch.  RMK
pointed out that some archs will place it really badly otherwise.

I appreciate the adaption of the ISDN drivers to the new PnP layer
(though I don't know why it was actually necessary to break the old
ISAPnP so late in the cycle), but the gratuitious changes to the coding
style were not exactly necessary. So revert things to the
"if (retval) goto err_unwind;" style and fix a couple of other compile
time errors.

into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.isdn