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

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

This is just again moving some common code into shared places,
let the chip-specific driver check the versions instead of having
every card-specific driver do so.

We use card->typ to decide which subdriver to call, so there's
no need at all for the subdriver to check again that card->typ is correct.

Share the code to display line status via LEDs and get rid of the
remaining ->cardmsg() users.

A lot of the subdrivers don't do anything in their ->cardmsg function
anymore, so we just remove those and make the callers check for NULL.

Also, add ops->bc_{,de}activate() for the drivers which want to be notified
of B-Channel activation.

Subdrivers which only drive PCI cards can have the dependency on
CONFIG_PCI moved to Kconfig, removing some ugly #ifdefs.

These users didn't bother doing request_mem_region() at all before
ioremapping, which is now automatically done using request_mmio()
instead.

This patch introduces, private to the HiSax driver, new helper functions
request_io/mmio(), which correspond to request_region()/
request_mem_region() but also are verbose about failures and keep track
of the allocated regions, so unwinding in case of errors is automatic.
  
Additionally, request_mmio() will also ioremap() the region.

	this patch must be applied after PnP patch v0.94. It contains my
small cleanups of PnP code and I tried to rewrite almost all ISA PnP
drivers to new PnP subsystem except sound drivers (ALSA & OSS).

  PnP update
    - separated dev->resource to dev->io_resource and dev->mem_resource
    - added pnp_*_valid() macros
    - added status member to pnp_card structure
    - added pnp_device_attach/detach functions
    - added pnpc_attach/detach functions
    - moved pnp_find_card() and pnp_find_dev() functions to isapnp.h
    - updated IDE/gameport/ISDN/network/scsi/radio/telephone drivers
      to latest PnP code

This patch makes the ne.c compile and ISA pnp ne2k work after
changes in 2.5.54 for PNP broke it.

 a. use pnp_dev instead of pci_dev
 b. convert to appropriate pnp_*()'s
 c. check -1 instead of 0 for invalid IRQ

This patch allows isapnp cards to be detected now.  Seems around 2.5.54,
a change in isapnp_build_device_list changed:

	card->protocol = &isapnp_protocol;
	 to
	card->protocol = &isapnp_card_protocol;

This patch adapts isapnp_init to the above change.

In 2.5.50 the level of isapnp_init was moved to after apci.  Since it is
now after net_dev_init, ISA PNP NICS fail to initialized at boot.

This fix allows ISA PNP NIC cards to work during net_dev_init, and still
leaves isapnp_init after apci_init.

This separates the "PPro/Celeron/Pentium-II" compile option into "PPro"
and "Pentium-II/Celeron" options.

This allows us to explicitly support the Pentium II and Celeron,
specifically adding the `-march' option for the chip and enabling the
unaligned copy optimizations.  PPro support remains unchanged.

This patch is by Luuk van der Duim with some changes by me (primarily to
also support the pre-Coppermine Celeron chips, since those use Pentium
II cores).  This patch has been in 2.5-mm for awhile and Andrew ack'ed
this submission.

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

Update sa1100_ir to use new dma-mapping subsystem.  Register a
system device for the SIR/FIR uart port, and a device driver for
this driver.

set_irq_type is redundant for many SA1111 drivers.  The active edge
is setup by the core SA1111 code for the common case.

SA1111 driver names are lower case.  Make the sa1111 ohci driver
reflect this.

Add sa1100_wdt watchdog support.