From: Martin Schwidefsky <schwidefsky@de.ibm.com>

s390 core changes:
 - Merge 31 and 64 bit NR_CPUS config option. Default to 32 cpus.
 - Remove unused system calls from compat_linux.c.
 - Add statfs64 and fstatfs64. Reserve system call number for
   remap_file_pages.
 - Merge do_signal32 into do_signal.
 - Don't remove the per bit and the program mask from the user psw
   due to a signal.
 - Fix a problem with gdb and interrupted system calls.
 - Fix single stepping of interrupted system calls.
 - Fix compiler warnings in bitops.h.

From: Anton Blanchard <anton@samba.org>

bitops.c was a bit of a mess wrt formatting so run it through Lindent.  No
code changes.

From: Tom Rini <trini@kernel.crashing.org>

When I converted the use of PCI_DMA_foo constants to DMA_foo constants, I
forgot that it's PCI_DMA_FROMDEVICE and DMA_FROM_DEVICE.  The following
fixes that.

From: Tom Rini <trini@kernel.crashing.org>

include/asm-ppc/dma-mapping.h was made to be a 'real' header recently and
therefore missed out on the updates that davem did to all of the other
versions.  This updates <asm-ppc/dma-mapping.h> to match what's expected
now.

From: Tom Rini <trini@kernel.crashing.org>

When Dave Miller updated <asm-ppc/pci.h> for the _for_device and _for_cpu
portions of the PCI DMA API, he assumed that on PPC32 consistent_sync*
would also need to be changed for device or cpu.  This is not the case, so
what this does is the pci_*_for_{cpu,device} calls call
consistent_sync{,page} again.

From: Tom Rini <trini@kernel.crashing.org>

Fix a cut & paste error in forward porting from 2.4, we don't reference
dev->bus or dev->devfn, both are passed as arguments.

into ppc970.osdl.org:/home/torvalds/v2.5/linux

Fix memory corruption in the HT init on x86-64 recently introduced by me.

Fix from from Suresh B. Siddha.

 - Chen Yang's fix to work with NGROUPS
 - Chen Yang's fix to handle file deletion
 - Remove TCGETS handling and return  -ENOTTY for unknown ioctl code.
 - Removed InterMezzo from BROKEN state

The proc_rtas_init call in procfs was removed (replaced with an
initcall) but the prototype was still hiding. Kill it.

From: Andre Hedrick <andre@linux-ide.org>

Tested on Epox 8K9A3+ and 4PCA3+ by Tomi Orava <Tomi.Orava@ncircle.nullnet.fi>.

It was tested by a few people and has been in -mm since 2.6.4-rc2-mm1.

ATAPI multi-lun support has been broken for a long time.

It used to be that "(drive->id->last_id & 0x7) + 1" was used as
shost->max_lun and the "hdXlun=" kernel parameter could be used to
override this value.

However it was far from optimal:
- people played with "hdXlun=" and then complained about multiple instances
  of the same device (most ATAPI drives respond to each LUN)
- probably some devices return 7 not 0 in id->last_id (=> 7 x same device)

This patch from Willem Riede <wrlk@riede.org> fixes it w/o need
for "hdXlun=" option.  It was tested by Willem on ATAPI PD/CD drive.

wait_task_inactive is now only used in two non-time-critical places: the
ptrace code to guarantee a schedule and kthread_bind so we can change
the thread CPU.  Unfortunately with preempt, the code as stands has a
race: we might return because the thread is preempted, not because it
actually reached schedule().  The ptrace code (probably) doesn't care,
but the kthread code does.

This patch simplifies the (now over-optimized) code, and does a yield()
for the preemption case.

into kroah.com:/home/greg/linux/BK/usb-2.6

Simple obvious patch so that all calls to blkpg from the non-native
environment don't get -EINVAL

into ppc970.osdl.org:/home/torvalds/v2.5/linux

into redhat.com:/spare/repo/net-drivers-2.6

RX skbs are always considered maximally sized, until actual reception
of the RX frame occurs.  So, update this driver to always map and
unmap a maximally sized skb.  This fixes this driver on several
non-x86 platforms.

into ppc970.osdl.org:/home/torvalds/v2.5/linux

into ppc970.osdl.org:/home/torvalds/v2.5/linux

into ppc970.osdl.org:/home/torvalds/v2.5/linux

Verified to not break anything on x86 either.

This saves some memory and is easier to understand what is happening.

into ppc970.osdl.org:/home/torvalds/v2.5/linux

We also need the following patch to build the generic_defconfig
after the DMA API change:
    http://linux.bkbits.net:8080/linux-2.5/cset@405490e15inT3T0H2x887j9SaMkYRQ

into kroah.com:/home/linux/BK/usb-2.6

into ppc970.osdl.org:/home/torvalds/v2.5/linux

This patch is from Iomega, and it allows random write opens of CDROM's
that support the feature.

From: Anton Blanchard <anton@samba.org>

We have some versions of firmware out there that have huge OF properties.
So huge that we end up overwriting our initrd.

Place a 1MB limit and warn bitterly if its over this.  Also fix a use of
package-to-path where the variable was 64bytes but we would pass in a
length of 255.

From: Anton Blanchard <anton@samba.org>

ppc64 defconfig update

From: Jeremy Kerr <jk@ozlabs.org>

This patch fixes the sleep in spinlock hvc bug in hvc_write().

The code is a little longer, but protects against large amounts of memory
being kmalloc()ed by userspace, and minimises calls to copy_from_user().

From: Anton Blanchard <anton@samba.org>

Clean up xmon backtrace code, it was doing all manner of scary things.

From: Anton Blanchard <anton@samba.org>

Cleanup ppc64 procfs code:

- Use initcalls everywhere. This allowed us to remove the iseries proc
  callback interface.
- Kill proc_pmc.c. Most of it wasnt used (and we are planning to export the
  PMCs via sysfs). The few things left were iseries specific so they
  got moved into iSeries_proc.c.
- Kill pmc.c. We dont use those statistics and the ones that are left
  can be gained via PMCs.
- Create /proc/iSeries and /proc/ppc64 very early. This means we no
  longer have to call proc_ppc64_init in all the drivers, we can
  assume its there.
- Fix some error return cases in rtas-proc.c and rtas-flash
- Dont even try some pseries specific drivers on pmac.