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

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

into sgi.com:/source2/xfs-linux-2.6

SGI Modid: xfs-linux:xfs-kern:167581a

padding to ic_roundoff to cater for pad in reservation cursor updates.

SGI Modid: xfs-linux:xfs-kern:167580a

SGI Modid: xfs-linux:xfs-kern:167547a

SGI Modid: xfs-linux:xfs-kern:167442a

SGI Modid: xfs-linux:xfs-kern:166619a

SGI Modid: xfs-linux:xfs-kern:167279a

SGI Modid: xfs-linux:xfs-kern:167273a

SGI Modid: xfs-linux:xfs-kern:167222a

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

Which is a lot simpler than the two-way counter implementation.

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

into kroah.com:/home/linux/BK/pci-2.6

This patch contains the following:
1.  Fix up the pcie and shpc options to make it easier for distros
    to use as what we have discussed;
2.  Fix bug encountered when installing the drivers on non-hotplug
    systems;
3.  Put PCI_CAP_ID_SHPC in include/linux/pci.h

into kroah.com:/home/linux/BK/driver-2.6

Fix two OHCI unlink issues.

   * All EDs now get a 1 msec delay before re-linking, even those
     which were seemingly "clean" unlink cases.  This gets rid of
     some list corruption issues ("bad entry") by getting rid of
     a fast-path carried over from 2.4 usb-ohci.

   * In case of unlink-during-submit, we must giveback() right away.
     This is a reasonably rare case.

There have been recent reports of problems here.  The "bad entry"
showed up with usbtest tests #11 and #12, or "stir4200", and maybe
in other cases.  The unlink-during-submit shows up in usbtest.

The DACA sound driver (early iBook models) doesn't clear the i2c_client
structure. That cause the embedded struct device (and thus kobject) to
contain garbage in the "k_name" field, which kobject_set_name will
later try to kfree...

Also remove references to unused struct data_data.

Thanks to Linda Xie for pointing this out.

Here is a small ISDN fix for the current tree.

There is a compiler inlining/optimation problem with strpbrk, if it has
only a one character search string.  This results in a missing strchr
because the compiler internally replace strpbrk with strchr in this
case, but did so after inline handling stage.

A small birdie tells us that in the long run it may not be a good idea
to write the APIC ID register.  It might be read-only in some
hypothetical situation down the road.

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

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

From: Philippe Elie <phil.el@wanadoo.fr>

When I debugged P4 ht oprofile a few month ago I noticed that but though it
wasn't a problem...  The fix I propose is not completely clean.

With P4 HT we split msr in two subset, one for each logical processor.  The
msrs subset used in op_model_p4.c at save and setup point of view are
distinct (*), it means we must serialize setup and save operation else a
logical processor can save some msr value already setup by the other thread
then when oprofile shutdown we restore wrong msrs values.

Nobody noticed the problem because after restoring the msrs we call
enable_lapic_nmi_watchdog() -> setup_p4_watchdog() wich clear all the msrs
but it's a bit fragile.  If nmi watchdog is not enabled nothing bad occurs
because the LVTPC remains disabled.

(*) this is done in this way because it allows a lot of simplification in
op_model_p4.c, yes it isn't clean but it's not fixable w/o rewriting 75% of
op_model_p4.c and I think the code will be bigger and more complex.

From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>

I need the following patch to kill a warning (__endian() may be unused)
when cross-compiling m68k kernels on an ia32 box.

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

The syscalls.h change broke the m68k interrupt management code, since
sys_{request,free}_irq() are not syscalls, but routines to manage system
(CPU) interrupts.

From: Pavel Machek <pavel@ucw.cz>

Without this, if there's not enough swapspace, suspend fails, but leaves
devices suspended, leading to dead machine.

From: Dmitry Torokhov <dtor_core@ameritech.net>

Do not call hotplug until firmware class device is completely instantiated.

From: Dmitry Torokhov <dtor_core@ameritech.net>

We need to pin the firmware loader module until the last reference to the
firmware class device is dropped and the class device is destroyed.