From: Geert Uytterhoeven <geert@linux-m68k.org>

Update Macintosh driver config logic:
  - Move remaining Mac/m68k-specific logic from arch/m68k/Kconfig to
    drivers/macintosh/Kconfig
  - Fixup Mac/m68k conflicts

From: James Simmons <jsimmons@infradead.org>

Remove kd.h.  We don't need this header.  Use the inline functions to set
the current process state.

From: Michael Hunold <hunold@linuxtv.org>

- dvb-ttusb-budget: Fixed i2c code to detect nearly all errors

- dvb-ttusb-budget: Added "V 2.1" to prevent warning message on driver load

- dvb-ttusb-budget: Some printks turned into dprintks

- dvb-ttusb-budget: Removed __initdata.  It is now possible in kernel 2.6
  to compile the DVB drivers into a monolithic kernel.

- dvb-ttusb-budget: Fix for failing urb submission under 2.6 kernels

From: Michael Hunold <hunold@linuxtv.org>

- av7110: check result of saa7146_wait_for_debi_done() in av7110_bootarm()
  and bail out early if booting the ARM failed

- av7110: correct voffset for analog standard

- av7110: replace usage of sleep_on_interruptible_timeout() with
  wait_event_interruptible_timeout()

From: Michael Hunold <hunold@linuxtv.org>

- tda1004x: standardised where the firmware should be.

- tda1004x: need to re-invert inversion for tda10046 in get_fe()

- tda1004x: reset chip before uploading firmware

- tda1004x: split firmware upload off from frontend init.  the initial tune
  attempt was taking too long.  provide explanation of tuner frequency
  calculations

- tda1004x: Fixed signal strength reading for tda10046h

From: Michael Hunold <hunold@linuxtv.org>

stv0299: Added seperate settings for SU1278 on Technotrend hardware

From: Michael Hunold <hunold@linuxtv.org>

- alps_tdlb7 + alps_tdmb7: Changed to use full i2c reads in probing instead
  of i2c pings to be compatable with ttusb

- nxt6000: bugfix by Robert Cook: FE_RESET did the same as FE_INIT, thus
  invalidating current channel settings on FE_RESET

- sp887x: fixed typo

- Makefile: add nxt6000 frontend driver to Makefiles

- Kconfig: DVB_TDA1004X and DVB_NXT6000 do not depend on !STANDALONE (i.e.
  no compile-time firmware image necessary)

- ves1820: turn off ves1820 test output pins

- ves1820: verbose-print AFC only if carrier has been recovered

- ves1820: change AFC handling as suggested by Robert Schlabbach, use bit 1
  of the SYNC register for FE_HAS_SIGNAL

From: Michael Hunold <hunold@linuxtv.org>

- dvb-core: replace usage of sleep_on_...() with
  wait_event_interruptible_timeout()

- dvb-core: fix dvb_ringbuffer_read/write() buffer pointer bug

- video: added VIDEO_EVENT_FRAME_RATE_CHANGED and VIDEO_GET_FRAME_RATE
  ioctl

From: Michael Hunold <hunold@linuxtv.org>

skystar2: renamed two functions, deleted spurious spaces.

From: Michael Hunold <hunold@linuxtv.org>

- saa7146: fix timeout bug on AMD64 in saa7146_wait_for_debi_done()

- saa7146: release resources for video overlay properly, don't
  (incorrectly) rely on VIDIOC_OVERLAY(0)

From: Michael Hunold <hunold@linuxtv.org>

- dvb docs: added a nice howto on how to get Avermedia DVB-T running - nice
  tutorial for DVB newbie, too

- dvb docs: fix various incorrect informations in cards.txt, faq.txt,
  firmware.txt

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

Add z/VM discontiguos saved segments (DCSS) block device driver.

From: Arnd Bergmann <arnd@arndb.de>

With the s390 updates in -mm3, you also need this patchlet.

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

Add new features to the zfcp host adapater driver:
  - Add support for FCP access control.
  - Error recovery enhancements.

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

Add channel measurement block interface.

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

Add collaborative memory management interface.

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

Add Linux - z/VM monitor stream.

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

Add virtual timer interface.

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

DASD driver fixes:
 - Fix generic_set_online if diag discipline is not availab.e
 - Fix reserve on already reserved device.
 - Use default-erp for unit check without sence information.
 - Revert dasd naming scheme change from dasd<xyz> to dasd_<busid>_. This
   breaks too many user space packages.
 - Extend dasd naming scheme to four letters dasd<aaaa>-dasd<zzzz>.
 - Fix formatting of dasds.

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

IUCV interface fixes:
 - VM workaround: redirect setmask call to cpu 0.
 - Disable message interrupts during connection setup.
 - Honor incoming connection severed during connection setup.
 - Add connect retry when remote severed connection.
 - Add symlinks between net device and iucv device.
 - More fixes for proper net device allocation/deallocation.

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

LCS network driver fixes:
 - Fix ccwgroup behaviour, remove should offline cards still online.
 - Better not write to the debug feature before it is registers.
 - Don't free card structure on offline but on remove.
 - Check for deferred condition code 1 in lcs_irq for halt requests.
 - Call free_netdev only if there is a net device.

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

CTC network driver fixes:
 - Fixed some debug messages (did not compile with DEBUG defined).
 - Added sanity checks in ctc_proto_store() & ctc_shutdown_device().
 - Added some bugfixes from 2.4.
 - Tweaked logging.
 - Removed syntax error in pr_debug call.
 - Changed do_IO (not existing any more) to ccw_device in messages.
 - Corrected format failure in pr_debug of channel_get.
 - Add symlinks between net device and ctc device.
 - Add tiocmset/tiocmget API change patch from Russell King
 - Fix locking problem in ctc_tty_cleanup.

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

sys_timer_settime returns EINVAL if *new is NULL, compat_timer_settime
returns EFAULT.  Add a check to compat_timer_settime to return EINVAL
if *new is NULL.

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

Console driver fixes:
 - Fix ^n at end-of-line check in 3215 and sclp driver.
 - Fix copy_from_user/might_sleep/spinlock problem in sclp.

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

Common i/o layer fixes:
 - Add atomic onoff variable to ccw devices and ccw-group devices to
   avoid races during online/offline.
 - Fix pr_debug calls.
 - A lot of path fixes:
   + Set device to disconnected state after no path event.
   + Fix chpid vary on/off for single path devices.
   + Make logical vary on/off consistent with physical vary on/off.
   + Don't update subchannel schib if the device is gone (dnv not set).
   + Add code to recover lost chpids after machine checks.
   + Avoid processing link incidents, resource accessability events and
     chpid machine checks for logically offline chpids.
   + Recover disconnected devices after chsc machine checks.
   + Delay de-registering of no path devices to avoid deadlocks.
   + Don't redo ssd for known subchannels - the info is static.
   + Introduce a second, "slow" machine check handler thread for new devices.
     The "fast" machine check handler only recovers disconnected devices.
 - Deregister subchannel rather than ccw device on not oper events.
 - Fix calling sequence of notify function vs. path verification.
 - Reset timeout for disconnected devices.
 - Fix problem with debug feature and %s arguments.
 - Fix __get_subchannel_by_stsch to deal with "zombie" subchannels.
 - Avoid "zombie" subchannels if device is not operational during sense id.
 - Handle call to the io_subchannel remove function if the ccw device
   is not registered yet.
 - Add availability attribute for ccw devices: "good", "no device",
   "no path", "boxed".
 - Export ccw_device_work for qdio as module.
 - Retry sense id for tape devices which present intervention required.
 - Don't check the activity control to decide if the device driver interrupt
   handler needs to be called but use the bits in status control.
 - Fix race in ccw_device_stlck.
 - Accumulate deferred condition code.
 - Fix setting_up_sema locking.
 - Call qdio_shutdown instead of qdio_cleanup on failed establish.
 - Fix problem when 64 FCP adapters are initialized simultaneously.
 - Fix problem with >64 adapter interrupt capable devices.
 - Reduce stack usage in qdio.

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

Core s/390 changes:
 - Add -mbackchain to CFLAGS to prepare for gcc 3.4 with comes with a
   default setting of -mno-backchain
 - Add implementation of strcpy.
 - Pad bytes after string end in strncpy.
 - Fix __sem_update_count inline assembly for gcc 3.4.
 - Export smp_ptlb_all for tlb flushing in module code.
 - Fix sched_clock.
 - Remove the last KERNEL_VERSION #if in s390 code.
 - Add dummy implementation for missing dma_{alloc,free}_coherent.
 - Avoid cast of lvalue in idal_buffer_{from,to}_user.
 - Remove _exit definition from unistd.h.

From: Christoph Hellwig <hch@lst.de>

Take a reference before calling into the module and release it after we're
done.  Also remove the useless (and wrong) refcounting in videocodec -
symbols from this module are used by other modules if we call into those
functions so it can't be unloaded anyway.

We really need to add a debug check to tip all those
try_module_get(THIS_MODULE) callers..

From: <fabian.frederick@gmx.fr>

- Avoid sync_fs with clean fs & wait mode = 0

- mark_files_ro overrides pending deletes (doc)

- some trivial doc fixes

From: Roman Zippel <zippel@linux-m68k.org>

This driver adds full read/write support for HFS+ and is based on the
readonly driver by Brad Broyer.

Thanks to Ethan Benson <erbenson@alaska.net> for a number of patches to
make the driver more compliant with the spec.

From: Roman Zippel <zippel@linux-m68k.org>

This is a complete rewrite of the HFS driver, it gets rid of a all the
special conversion options, which belong in user space.  The driver uses now
a btree support very similiar to HFS+, so that both could be merged at some
point.

Thanks to Ethan Benson <erbenson@alaska.net> for a number of patches to make
the driver more compliant with the spec and Christoph Hellwig <hch@lst.de>
for fixing up the documentation.

From: Geert Uytterhoeven <geert@linux-m68k.org>

Zorro8390 Ethernet: Convert to the new driver model

For some unknown reasons Nvidia NForce3 doesn't use the standard Hammer AGP architecture,
but requires set up of some shadow registers. This patch adds that to the K8 AGP driver.

Based on an old 2.4 patch from someone at Nvidia.

Also includes another bug fix for the K8 AGP handler, from Brad House.
We should not assume that there is only one northbridge in a Uniprocessor system.
Always flush all.

Also some minor cleanup.

Give 32bit emulation ioctl handlers the same locking rules as normal ioctl handlers.
This will avoid surprises in driver code.

Most call sys_ioctl who would take it anyways.

This adds a new completely rewritten machine check handler for x86-64.
The old one never worked on 2.6.

The new handler has many improvements. It closely follows the Intel and AMD
recommendations on MCE handlers now (the old one had many violations). It handles
unrecoverable errors in user space better now - it will only kill the process now
if possible instead of panicing.

This one is CPU independent now - it should work on any CPU that supports the standard
x86 MCA architecture.

This new handler only logs fatal errors that lead to kernel panic to the console.
Non fatal errors are logged race free into a new (non ring) buffer now
and supplied to the user using a new character device.  The old one could
deadlock on console and printk locks. This also separates machine check errors
from real kernel errors better. The new buffer has been also designed to
be easily accessible from external debugging tools: it has a signature
and could be even recovered after reboot. It is not organized as a ring buffer -
this means the first errors are kept unless explicitely cleared.

The new error formats can be parsed using ftp://ftp.suse.com/pub/people/ak/x86-64/mcelog.c
The new character device for it can be created with mknod /dev/mcelog c 10 227

There is a new sysfs interface to configure the machine check handler.
It has a "tolerant" parameter that defines the aggressiveness of the machine check:

0: always panic
1: panic if deadlock possible (e.g. MCE happened in the kernel)
2: try to avoid panic

Default is 2

Despite of having more features the new handler is shorter.

Bring the x86-64 port up to date. Lots of smaller bug fixes that have accumulated.
Also fixes another nasty bug introduced by the IA32e changes that causes BUGs at
boot for some people.

Only changes x86-64 specific files. There are some other changes that I'm sending
separately.

 - Some cleanup in NMI watchdog code
 - Fix HyperThreading CPU setup race (Suresh B. Siddha)
 - Update defconfig
 - Add a comment on why iommu_fullflush is disabled.
 - Export sys_ioctl again
 - Fix build with IA32_EMULATION=y and SYSVIPC=n
 - Remove noisy boot printks in the mptable scan.
 - Implement automatic NMI watchdog switching for real now
 - Remove redundant 32bit ioctl handlers for autofs
 - Remove CONFIG ifdefs around rtc 32bit ioctl handlers
 - Remove useless nfsctl ifdef in syscall.c (Al Viro)
 - Increase padding for prefetchw alternative
 - Check for NX bit early before setting up memory maps (Suresh B. Siddha)
 - Change Intel IA32e config description and fix help texts (Jun Nakajima)
 - Fix microcode driver build really now (Dave Jones)
 - Add nohpet option to disable HPET timer
 - Fix double semicolon in aperture.c
 - Add cmpxchg16b cpuid entry
 - Fix return value of read_pci_config_16 (Paul Menage)
 - Fix __KERNEL_COMPAT32_CS (Zachary Amsden)
 - Disable the infamous 30 minutes check in CMOS time setting
 - Update URLs in Kconfig (Petri T. Koistinen)
 - Fix ACPI interrupt source parsing for Nforce3 (Maciej W. Rozycki)
 - Fix 32bit ipc version parsing.
 - Run local APIC NMI watchdog only once a second (or less often on idle boxes)
 - Merge ACPI APIC SCI functions from i386
 - Add i8254 timer suspend code from i386
 - Merge with 2.6.2-rc3 + minor changes from i386
 - Fix empty_zero_page declaration (Greg Johnson)
 - Readd sysctls for exception/page fault trace and vsyscall32
 - Fix WCHAN
 - Fix STACK_TOP usage. Stack for 64bit processes should be at the
   top of memory now again. Also set it correctly for LINUX32_3GB.
 - Add warning fixes for gcc 3.4 and -Wdeclaration-after-statement

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

From: Andreas Gruenbacher <agruen@suse.de>,
      and me.

Latest gcc cvs is able to detect mismatches between functions which are
tagged asmlinkage and declarations which are missing asmlinkage.  Or vice
versa.

Fix up the fallout from an x86 allyesconfig build.

From: "Randy.Dunlap" <rddunlap@osdl.org>

Add syscalls.h, which contains prototypes for the kernel's system calls.
Replace open-coded declarations all over the place.  This patch found a
couple of prior bugs.  It appears to be more important with -mregparm=3 as we
discover more asmlinkage mismatches.

Some syscalls have arch-dependent arguments, so their prototypes are in the
arch-specific unistd.h.  Maybe it should have been asm/syscalls.h, but there
were already arch-specific syscall prototypes in asm/unistd.h...

Tested on x86, ia64, x86_64, ppc64, s390 and sparc64.  May cause
trivial-to-fix build breakage on other architectures.