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

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core

- Remove count and off parameters from per-node meminfo show() method.

- Remove count and off parameters from show() methods.
- Remove manual handling of reading from an offset, since the sysfs core
  handles that now. 
- Remove temp. buffer. 

- Remove count and off parameters from show() methods.
- Remove off parameter from store() methods.

Note 1: These have not been tested, but should be obviously correct.

Note 2: snprintf() was replaced with sprintf() where the filled buffer 
would obviously be < PAGE_SIZE. (like when printing single integer values).
In places where strings were printed, PAGE_SIZE is used as the max string
size.

- Reinstate count parameter for store() methods.
- Remove off parameter from st.c and osst.c sysfs methods.
- Remove count parameter from st.c and osst.c show() methods.

- Fixup struct device_attribute.
- Fix the default device attributes.

- Fixup bus, driver, and class methods.

- Fixup subsys_sysfs_ops along the way.

...instead of returning the error value (which is number of bytes remaining).

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