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.

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).

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."

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

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.)

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.

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

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

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.

From: Matt Mackall <mpm@selenic.com>

Quick fix to work around gcc3.5's automatic inline and broken stack
requirements calculation. Without this, I see stack overflows at boot
with 4k stacks.

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

Kernel 2.6 lacks two -EFAULT returns in get_user() in kernel/sysctl.c.

From: Ulrich Drepper <drepper@redhat.com>

Opening a non-existing block device currently yields an ENXIO error.  Doing
the same for char devices produces the correct error ENODEV.

From: Sam Ravnborg <sam@ravnborg.org>

In the i386 case we need to generate asm-offset.h, before starting building
the kernel tree.  Building asm-offset.h causes us to use one of the
shorthands in the top-level makefile, namely the one for .s files.  The one
that allows us to do: make some/dir/file.s

And this shorthand happens to have a dependency to scripts, therefore I did
not see this problem on i386.  But David hit it with sparc64, because there
is no asm-offset.h file.  No parallel stuff involved here, just an ordinary
error.

It's now called from the CPU hot-add notifier.

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

fusion needs several separately allocated coherent regions and
requires that they all be in the same 4GB segment.  Obviously this may
fail.  The hack is to force the coherent_dma_mask to 0xffffffff thus
ensuring that all the allocations occur within the first 4GB.  This
hack breaks Altix entirely.

into neo.rr.com:/home/ambx1/linux/bk/linus-2.5

ISAPnP support has been stable with the new pnp layer for a while.
This patch removes the experimental dependency.

This patch allows the serial driver to bind to three additional modems.

isapnp_cfg_begin and isapnp_cfg_end are exported symbols, so if any
module using them is loaded isapnp.o can't be unloaded anyway

// Linux 2.6.4-rc2
// These 2 functions shouldn't be __init for general PNP use

This patch fixes a bug in the resource configuration function.  If
there are more than one memory ranges, the isapnp driver will write
into the incorrect configuration register.

The class of device is displayed in wrong byte order. This patch swaps it
and now the inquiry_cache attribute shows the same as the userspace tools.