From:  Jesse Barnes <jbarnes@sgi.com>

  Quick add to the maintainers file for SN (aka Altix 3000) support in
  the kernel.

From:  Adrian Bunk <bunk@fs.tum.de>

  the patch below removes the unneeded #define LinuxVersionCode from
  eata.c. It's not used and if it was needed KERNEL_VERSION in
  include/linux/version.h does the same.

From:  Steven Cole <elenstev@mesatop.com>

  This is a slightly improved version of the additional help texts for
  sound/oss/Kconfig.  The originals were obtained from 2.4.21-pre4.

From:  Scott Russell <scott@pantastik.com>

  - Rearranged unreachable code reported at kbugs.org

From:  Adrian Bunk <bunk@fs.tum.de>

  The following trivial patch updates the short description for
  BLK_DEV_HPT366 (the HPT372 and the HPT374 are supported, too):

From:  Jonathan Corbet <corbet@lwn.net>

  This fix has been acked by James Bottomley, but has not risen above Linus's
  threshold.

From:  Rusty Russell <rusty@rustcorp.com.au>

  I don't think it's misused anywhere, but it's better to be safe.

  Pointed out by Joern Engel.

From:  Scott Russell <scott@pantastik.com>

  - moved return to eliminate unreachable code reported by kbugs.org

From:  Amit Shah <shahamit@gmx.net>

  The read function for consoles in include/linux/console.h contains const
  char* for a pointer that it will actually modify. Although no one seems
  to be using this as of now, it should be corrected.

No longer need to call the 68328 specific int setup. Now all
done by the common 68328 int handler code.

No longer need to call the hardware specific int setup.

This is now done in the common int handler for 68328
sub-architecture.

Modify the m68knommu/68328 specific ints.c to be the general ints
handler when building for this sub-architecture. It is just simpler to
have one for each sub-architecture (which means we currently need 3
for the 3 prominant m68knommu families). Each can handle the hardware
setup differences, and there is a few at this level. This doesn't
really add much code overall, since 2 of the 3 m68knommu architectures
already had significant specific int handling code.

Add a config entry for defining static boot parameters
for m68knommu architecture.

CONFIG_BLK_DEV_LVM is gone, but there is still some associated code.
This is the include/linux/compat_ioctl.h part.

I consider myself the maintainer of this code, created the file,
want to destroy it again. It is unused and incorrect today.

CONFIG_BLK_DEV_LVM is gone, but there is still some associated code.
This is the x86_64 part.

CONFIG_BLK_DEV_LVM is gone, but there is still some associated code.
This is the parisc part.

s390 network device driver fixes:
 - Make use of SET_MODULE_OWNER.
 - Fix ctc interrupt handler.

Bug fixes for the s390 tape device driver:
 - Remove tapechar_init() from mem.c. It is called via module_init anyway.
 - Remove unnecessary #include <version.h>
 - Make tape_block compile. Add fixme.
 - Export symbols needed by tape discipline drivers.

s390 console driver fixes:
 - Register console ttys via module_init. Remove sclp_tty_init and
   tty3215_init from tty_io.c
 - con3215: use set_current_state.
 - sclp: Fix race condition in sclp interrupt handler. Fix deadlock on
   sclp_conbuf_lock for certain error conditions.

s390 block device driver fixes:
 - dasd: Don't continue on error in dasd_increase_state. Use hex_ascii view
         for the dasd debug area. Fix typo.
 - xpram: Fix setup of devfs_name.

s390 32 bit compatability fixes:
 - Fix compat entries in the system call table.
 - Update to new compat_ioctl mechanism.
 - Define compat_alloc_user_space.

Remove unnecessary MOD_INC_USE_COUNT/MOD_DEC_USE_COUNT pairs.

cio: Add code to break a reservation of a device (steal lock).

Add module alias support for ccw devices.

Optimize s390 inline assemblies.

Base s390 bug fixes:
 - arch: Do create_proc_entry for debug feature outside spin locked code.
 - arch: Fix system call tracing for 64 bit kernels.
 - arch: Export empty_zero_page for use in binfmt_elf32 module.
 - arch: Fix call trace output and remove dead remote-debug code.
 - arch: Correct OUTPUT_ARCH for 64 bit compiles.
 - arch: Fix in_atomic.
 - arch: Fix broken _PAGE_INVALID_xxx definitions.
 - arch: Add __kernel_old_dev_t for 64 bit.
 - arch: adapt to new do_fork interface.
 - arch: set CR5 to get program checks for space switching instructions.
 - cio: Fix /proc output of blacklist ranges.
 - cio: Restructure chsc to avoid GFP_KERNEL allocation while holding a lock.
 - cio: Fix wait_cons_dev.
 - qdio: use GFP_ATOMIC for memory allocations in interrupt.

Legacy here means pdc4030, ali14xx, umc8672, dtc2278, ht6560b and qd65xx.
They cannot be probed and initialized at a boot parameters' parsing time,
because probing code depends on not yet ready kernel subsystems.

This change also fixes boot parameters' ordering issue, fe. you could
pass "ide0=dtc2278 ide0=noautotune" and "noautotune" was catched too late.

"biostimings" cannot be hardcoded to -19, make it -8.
Code in ide_setup() assumes that everything <= -11 is a legacy
chipset name, so fe. "ide0=ali14xx ide0=biostimings" will fail
while "ide0=biostimings ide0=ali14xx" will be okay.

This further optimizes the 'kick wakeup' scheduler feature:

 - do not kick any CPU on UP

 - no need to mark the target task for reschedule - it's enough to send an
   interrupt to that CPU, that will initiate a signal processing pass.

Well, this is it for me and strlcpy. I'll leave the rest of the
non-obvious usages of strncpy to the kernel janitors. Seems like quite a
few uses really wanted memcpy instead, but I don't have time to
investigate them all. It does appear that nearly all strncpy's will be
removable. Obsoleting strncpy will probably atleast make the remaining
few think about how they are using it.

This is the patch for my trip through drivers/*.

Remove crt0_rom.S from m68knommu DragonEngine2 target config.

It is no longer required.

Start code for m68knommu DragonEngine2 target is now all in crt0_ram.S.

This patch moves all the code into this one file.

Remove crt0_himem.S from m68knommu DragenEngine2 config.

It is no longer required.

Numerous fixes for the m68knommu DragonEngine2 setup code.

It was out of date relative to more recent kernels.  Original patches
from Georges Menie.

Remove crt0_fixed.S from m68knommu DragonEngine2 setup.
No longer required.

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

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