From: Arnd Bergmann <arnd@arndb.de>

Enable basic profiling code on s390 depending on CONFIG_PROFILING, not
CONFIG_OPROFILE.

CONFIG_PROFILING should enable the generic profiling code here, even if
CONFIG_OPROFILE is not set.  Note that the identical code on i386 is always
compiled in, regardless of CONFIG_PROFILING and CONFIG_OPROFILE.

From: Michael Hunold <hunold@convergence.de>

unfortunately it's possible to remove a DVB adapter module even if a DVB
network device has been set up using this adapter.

The attached patch fixes this problem.

From: Matt Tolentino <metolent@snoqualmie.dp.intel.com>

This trailing space in sysfs contents is not needed.

From: Trond Myklebust <trond.myklebust@fys.uio.no>

fs/nfs/direct.c: In function `nfs_direct_IO':
fs/nfs/direct.c:458: warning: int format, different type arg (arg 2)

From: Adam Belay <ambx1@neo.rr.com>

Fix http://bugme.osdl.org/show_bug.cgi?id=2540

It prevents PnP detection if devices were already detected by SuperIO.

Ensure that when we send the SETATTR call after doing an O_EXCL create,
we always set the atime and ctime fields.

See RFC1813 for details on why the server is allowed to clobber these
two fields in order to cache a verifier that protects CREATE in case of
a timeout+resend from the client.

Patch is by Olaf Kirch.

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

Move HW interrupt register init. to the proper place
and don't force an interrupt if the IRQ is disabled
or in progress.

No pun intended, but X can't work if it can't turn on eXecute-permission
on the some data pages...

Just found I never changed type of move_page_tables when I changed it to
return offset: einormous mremap moves would fail on 64-bit.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

To avoid various livelocks, the writeback code parks all the dirty inodes onto
sb->s_io and then works through that list until it is empty.  This assumes
that each inode will be moved to some other list as it is processed.

But there's a loophole: if the ->writepages() implementation does nothing at
all, the inode is not redirtied (which would move it to s_dirty).  This causes
s_io to not empty and pdflush goes nuts.

So when this happens, move the inode onto s_dirty within
__sync_single_inode().  Use list_move_tail() to attempt to preserve the
time-ordering of the s_dirty list.

From: Mikael Pettersson <mikpe@user.it.uu.se>

This patch fixes three warnings from gcc-3.4.0 in 2.6.6-rc3:

- arch/i386/pci/pcbios.c: use of "+m" constraint

- drivers/char/ftape/: use of cast-as-lvalue

- drivers/char/ftape/: __attribute__((packed)) on something containing only
  bytes

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

Makes the Motorola PrPMC800 platform functional again.  This comes from Randy
Vinson <rvinson@mvista.com>.

From: Stephen Hemminger <shemminger@osdl.org>

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

Add oprofile support for s/390.

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

zfcp host adapter change:
 - Fix addressing exception due to uninitialized host_scribble pointer.

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

3270 device driver change:
 - Add missing irb error checking.

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

Network driver changes:
 - ctc: Add missing irb error checking.
 - iucv: Add name of net_device to iucvMagic to more than one
         connection between two guests.
 - qeth: Don't send IPA command if card is not in state SOFTSETUP or UP.
 - qeth: Fix number base in simple_strtoul call for buffer_count attribute.
 - qeth: Fix reallocating of buffers when buffer_count attribute is changed.
 - qeth: Correct handling of return codes in qeth_realloc_buffer_pool.
 - qeth: Don't call dev_close/dev_open on STOPLAN/STARTLAN commands.
         Use netif_carrier_off/netif_carrier_on instead.

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

Common i/o layer changes:
 - Don't use bus ids in crw debug feature.
 - Use cio_oper for oper notification to disconnected devices.
 - Remove __get_subchannel_by_stsch.
 - Make cio workqueue a single threaded workqueue.
 - Introduce addiotnal cio_notify workqueue for device driver notification.
 - Switch off path in vpm if cio_start returned -ENODEV.
 - Fix rescan for new subchannels after a logical vary on.

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.