architecture is now just a 64-bit configuration option of the
basic s390 architecture.

Merge s390x and s390 to one architecture.

Merge s390x and s390 to one architecture.

Merge s390x and s390 to one architecture.

Merge s390x and s390 to one architecture.

Merge s390x and s390 to one architecture.

Merge s390x and s390 to one architecture.

Merge s390x and s390 to one architecture.

s390 dasd driver:
 - Coding style adaptions. Removed almost all typedefs from the dasd driver.

s390 dasd driver:
 - Coding style adaptions. Removed almost all typedefs from the dasd driver.

s390 dasd driver fixes:
 - Take request queue lock in dasd_end_request.
 - Make it work with CONFIG_DEVFS_FS=y.
 - Properly wait for the root device.
 - Cope with requests killed due to failed channel path.
 - Improve reference counting.
 - Remove devno from struct dasd_device.
 - Remove unnecessary bdget/bdput calls.

Fixes for s390 kernel configured with CONFIG_SMP=n.

s390 console fixes for 3215 and sclp.

Common i/o layer fixes:
 - Fix for path no operational condition in cio_start.
 - Fix handling of user interruption parameter.
 - Add code to wait for devices in init_ccw_bus_type.
 - Move qdio states out of main cio state machine.
 - Reworked chsc data structures.
 - Add ccw_device_start_timeout.
 - Handle path verification required flag.

Add support for system calls with numbers > 255.

s390 fixes:
 - Initialize timing related variables first and then enable the timer interrupt.
 - Normalize nano seconds to micro seconds in do_gettimeofday.
 - Add types for __kernel_timer_t and __kernel_clockid_t.
 - Fix ugly bug in switch_to: set prev to the return value of resume, otherwise
   prev still contains the previous process at the time resume was called and
   not the previous process at the time resume returned. They differ...
 - Add missing include to get the kernel compiled.
 - Get a closer match with the i386 termios.h file.
 - Cope with INITIAL_JIFFIES.
 - Define cpu_relax to do a cpu yield on VM and LPAR.
 - Don't reenable interrupts in program check handler.
 - Add pte_file definitions.
 - Fix PT_IEEE_IP special case in ptrace.
 - Use compare and swap to release the lock in _raw_spin_unlock.
 - Introduce invoke_softirq to switch to async. interrupt stack.

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

unmap_vmas() eventually calls tlb_start_vma(), where most architectures
flush caches as necessary.  The flush here seems to make the
flush_cache_range() in zap_page_range() redundant, and therefore can be
removed.

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

This contains the following changes:
 - export some driver parameters in sysfs
 - use new module parameter definitions

This contains the following changes:
 - EOT detection fixed when writing in fixed block mode
 - asynchronous writes in fixed block mode and write threshold removed
   to enable the EOT fixes (the parameter accepted for compatibility)

This contains the following changes:
 - ILI fixed to work with really old drives
 - message printed in case block larger than read()
 - long timeout used when creating a tape partition

I managed to add a bug to the local APIC NMI watchdog's
resume procedure in the driver model conversion for 2.5.67.
The problem is that the resume procedure simply calls the
enable procedure. If the NMI watchdog has been disabled by
another driver (like oprofile or perfctr), then the NMI
watchdog will incorrectly be re-enabled.

I discovered this when updating the perfctr driver for 2.5.67
and seeing unexpected NMIs after a resume from apm --suspend.

We can fix this by unregistering the NMI watchdog from the
driver model when disabling it (like the code did before the
driver model changes), or by remembering the previous state
at suspend and checking it at resume. The patch below uses
the second, simpler, approach. Tested, please apply.

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

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

Following recent changes removing blk_queue_empty(), we were
incorrectly plugging the queue some times (most often as part of
the SCSI scan process).  This was causing a non-deterministic panic
in the scan code because a destroyed queue was sometimes being
unplugged and run.

Patch from cam mayor

when setting up the framebuffer on the clps711x platform, the code checks to see if your allocated memory area is less than 38400 bytes.  If it is, a comment is sent to the kernel output suggesting it could be placed into SRAM.  This patch modifies the check so that it is suggested if the allocated memory area is less than OR EQUAL TO 38400 bytes.  This value is important as 38400 bytes is exactly the size of a 320 x 240 x 4bpp screen.  

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

Patch from Ian Molton

missed a bit. apply ontop of earlier patch.

Patch from Ian Molton

See summary

Patch from Ian Molton

see summary

Patch from Dirk Behme

Please see mail thread '[patch] Cleanup of head.S?' from 25 Feb 2003. Let us remove the third part now. The mapping set by this code is done already.

The comment of rmk was

'I suspect we can kill (3) without hurting stuff that's merged into the
-rmk tree, although I'm sure there's a reason it existed.  I'll have
to check my mail archives, but I think there was a machine that required,
but it appears not to be merged.'

So, let's try and see if somebody cries...

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5

compile fix for PA-RISC