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

s390 core changes:
 - Move setting/clearing of TIF_31BIT thread flag to SET_PERSONALITY.
 - Use TASK_UNMAPPED_BASE in elf_map32 for mmaps with address 0.
 - Define ARCH_KMALLOC_MINALIGN.
 - Define ARCH_MIN_TASKALIGN.

From: <mikem@beardog.cca.cpqcorp.net>

Here's an update for the MAINTAINERS file.

From: <mikem@beardog.cca.cpqcorp.net>

This patch fixes the linux/include/cciss_ioctl.h file.  When support for the
cciss big ioctl was added the stucture in the header was put in the wrong
place.  If an application includes the file it will fail to compile.

From: Coywolf Qi Hunt <coywolf@greatcn.org>

This updates the kerneltraffic url link found in
Documentation/SubmittingDrivers and Documentation/kernel-docs.txt.

From: Meelis Roos <mroos@linux.ee>

arch/ppc/kernel/signal.c: In function `handle_signal':
arch/ppc/kernel/signal.c:518: error: `newspp' undeclared (first use in this function)
arch/ppc/kernel/signal.c:518: error: (Each undeclared identifier is reported only once
arch/ppc/kernel/signal.c:518: error: for each function it appears in.)
arch/ppc/kernel/signal.c:518: warning: long unsigned int format, pointer arg (arg 3)

On ppc64, __u64 is `unsigned long', so:

fs/cifs/cifssmb.c: In function `CIFSSMBSetFileSize':
fs/cifs/cifssmb.c:2466: warning: long long int format, __u64 arg (arg 2)

This fixes a locking problem noted by Tim Hockin:
    * /proc/swaps uses seq_file code, calling seq_path() with swaplock held
    * seq_path() calls d_path()
    * d_path() calls mntput() which might_sleep()

We add a new semaphore protecting insertions/removals in the set of swap
components + switch of ->start()/->stop() to the same semaphore [fixes
deadlocks] + trivial cleanup of ->next().

Early POWER5 revisions (<DD2.1) have a problem requiring slbie
instructions to be repeated under some circumstances.  The patch below
adds a workaround (patch made by Anton Blanchard).

This fix is from Paul Mackerras and was applied in 2.4 sometime late
last year.

On ppc64, touching addresses between the highest other mapping and the
stack can cause the stack to be extended way, way down, rather than
causing a SEGV as you would expect.  This patch only allows the stack
mapping to be extended to cover addresses actually within the stack
(as determined by looking at the process's r1).  This fix is ported
from 2.4

This fixes failures on the LTP's shmdt01, munmap01 and munmap02 tests.

In ide_init_default_irq() patch I overlooked that ppc_ide_md.init_hwif_ports()
called from generic ide_init_hwif_ports() can set hwif->irq and it will
be overwritten by ide_init_default_irq() if CONFIG_PCI is defined.  Fix
it.

I will clean it up properly later after killing ide_init_hwif_ports() on
ARM{26}.  Doing it now is just wasted effort.

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

Patch from Dirk Behme

Make ALTERA Excalibur work again in 2.6.4. Update serial driver uart00.c and defconfig.

This is an update of patch 1833/1.

Remove #include <config/pld/hotswap.h>, it isn't necessary at all. 

atomic_dec_and_test and atomic_add_negative didn't mark their
temporary variables as early-clobber.  Fix this.

This allows us to appropriately align shared mappings on VIPT caches
with aliasing issues.

Use named initialisers for monspecs; the format of the structure
changed a while back and it broke.

Use flush_cache_vmap() after creating mappings.  Also use BUG_ON()
rather than if() BUG().

These broke when find_first_bit/find_next_bit was added.

Patch from David Vrabel

Fix a trivial typo in a dma_unregister_dev printk.

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

a ppc64 tree.

into kernel.bkbits.net:/home/davem/net-2.6

More functions and data that should be static.

Thanks to Dru <andru@treshna.com>, who provided an easy way to reproduce
the problem.

What we have in lib/rwsem.c:__rwsem_do_wake():
	int woken, loop;
	^^^
and several lines below:
	loop = woken;
	woken *= RWSEM_ACTIVE_BIAS-RWSEM_WAITING_BIAS;
	woken -= RWSEM_ACTIVE_BIAS;

However, rw_semaphore->count is 64-bit on Alpha, so
RWSEM_WAITING_BIAS has been defined as -0x0000000100000000L.
Obviously, this blows up in the write contention case.

Fix new ISDN CAPI's internal ncci list semaphore if
CONFIG_ISDN_CAPI_MIDDLEWARE is disabled.

Thanks to Florian Schirmer.

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

into sgi.com:/source2/xfs-linux-2.6

SGI Modid: xfs-linux:xfs-kern:170489a