From: Anton Blanchard <anton@samba.org>

The ppc64 hotplug code must register and deregister devices with the extended
error handling (EEH) subsystem.

From: Anton Blanchard <anton@samba.org>

Linus just added it to the generic compat layer, we can remove this
(commented out) version.

This patch cleans up and makes more consistent the messages produced by
some of the iSeries virtual device drivers.  It also make them less
verbose.

controller is always in XLATE mode.

That's not true on at least some ppc64 boxes, and we
shouldn't break those just because apparently some
IBM PS/2 model 70 has something strange here.

Cset exclude: vojtech@suse.cz|ChangeSet|20040303141401|00802

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

Update Kconfig info to reflect the changes in wdt.c and wdt_pci.c

   Function divacapi_remove_cards() is now used for __init as well,
   so it may not be marked __exit.

   Removed own implementations for linked-list handling, use
   Linus kernel API of list.h instead.

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

Version 1.14 of pcwd.c - Changes that were made are:
* Extract the start code in a seperate function (pcwd_start)
* Extract the stop code in a seperate function (pcwd_stop)
* Extract the get_temperature code in a seperate function (pcwd_get_temperature)
* Make /dev/watchdog and /dev/temperature to different misc devices with their own fops
* Small clean-up's

Tested on pcwd card with temperature option.

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

into nuts.davemloft.net:/disk1/BK/net-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6

Fixes:
* Fix to htb_requeue routine.
* Debug mode related oops fixes.

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

into nuts.davemloft.net:/disk1/BK/sparc-2.6

From Jouni Malinen <jkmaline@cc.hut.fi>

Added Michael MIC keyed digest for TKIP (IEEE 802.11i/WPA). This algorithm
is quite weak due to the requirements for compatibility with old legacy
wireless LAN hardware that does not have much CPU power. Consequently, this
should not really be used with anything else than TKIP.

Michael MIC is calculated over the payload of the IEEE 802.11 header which
makes it easier to add TKIP support for old wireless LAN cards. An additional
authenticated data area is used (but not send separately) to authenticate
source and destination addresses.

From Jouni Malinen <jkmaline@cc.hut.fi>

Added support for using keyed digest with an optional dit_setkey handler.
This does not change the behavior of the existing digest algorithms, but
allows new ones to add setkey handler that can be used to initialize the
algorithm with a key or seed. setkey is to be called after init, but before
any of the update call(s).

Version 0.07 of softdog.c - Changes that were made are:
* Extract the start/keepalive code in a seperate function (softdog_keepalive)
* Extract the stop code in a seperate function (softdog_stop)
* Add notifier support
* Extract softdog_set_heartbeat code to seperate subroutine
* Small clean-up's

From Armin Schindler <armin@melware.de>:

  "These files were added in the first place for the compat
   driver to the legacy isdn4linux module. Since the Eicon
   driver now uses CAPI only, these files are obsolete."

Cleanup header file after changes to wdt.c and wdt_pci.c

Version 0.10 of wdt_pci.c - Changes that were made are:
* Extract the start code in a seperate function (wdtpci_start)
* Extract the stop code in a seperate function (wdtpci_stop)
* Convert wdtpci_ping so that it return an int value (0=succes).
* Extract the get_temperature code in a seperate function (wdtpci_get_temperature)
* Make /dev/watchdog and /dev/temperature to different misc devices with their own fops.
* Reorganize init and exit functions
* Make heartbeat (the emulated heartbeat) a module parameter
* Rewrite status flag code so that we could add a new tachometer module parameter
   + make clear distinction between PCI-WDT500 and PCI-WDT501.
* Small clean-up's

Version 0.10 of wdt.c - Changes that were made are:
* Extract the start code in a seperate function (wdt_start)
* Extract the stop code in a seperate function (wdt_stop)
* Convert wdt_ping so that it return an int value (0=succes).
* Extract the get_temperature code in a seperate function (wdt_get_temperature)
* Make /dev/watchdog and /dev/temperature to different misc devices with their own fops.
* Reorganize init and exit functions
* Make heartbeat (the emulated heartbeat) a module parameter
* Rewrite status flag code so that we could add a new tachometer module parameter
* Small clean-up's

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

into redhat.com:/spare/repo/misc-2.6

The gcc-3.5 patch broke building on x86_64 and possibly
others, because inflate.c does not pull in the definition
for noinline.

 - Fix CONFIG_DEBUG_INFO build again
 - Fix user exploitable oops in ia32 ioctl emulation

into foobazco.org:/sources/2.5-sparc-todave

into foobazco.org:/sources/2.5-sparc-todave

From: Stefan Holst <mail@s-holst.de>

The clean target is never called, so instead add this to CLEAN_FILES.

For some reason I don't understand, the last UDF filesystem update makes
the UDF deadlock when I write a bunch of mp3 files to a CDRW using the
packet writing patch.  Both "cp" and pdflush get stuck in __down. 

Reverting the semaphore changes makes the problem go away.  Use the
kernel lock again, until whatever recursive offender gets fixed.

(The offensive recursion seems to be: write() takes the inode semaphore,
causes memory pressure, and then trying to write back the inode or dirty
data to disk tries to get the semaphore again and deadlocks.)

This depended on CONFIG_SPARC, which is obsolete.  Use SPARC32 instead.

From: Stefan Holst <mail@s-holst.de>

Allow physical memory to start at almost arbitrary addresses.  LEON
needs it, so do SPARCstation 10/20 without slot 0 populated.  Although
Sun do not support this configuration, at least some such systems can
boot with this patch.

Physical memory starting at or above 0xF4000000 is not supported.

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

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

Use tasklet instead of workqueue for the divas main dpc.

Restructered the CAPI code of list handling and lock.

Removed obsolete code.

From: Marc-Christian Petersen <m.c.p@wolk-project.de>

2.4 patch from Adrian Bunk.

ERRORS

    The mprotect() function shall fail if:

    ...

    [ENOMEM]
        Addresses in the range [addr,addr+len) are invalid for the
        address space of a process, or specify one or more pages which are
        not mapped.