Please pull my for-linus branch: git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus Include a few more additions (including James's new IRQ debugging API) and a couple of fixes for problems caused by the last merge. I'm still waiting on test results for the _OSC problem, so that fix will be part of my next pull request, not this one. The IRQ debugging stuff is interesting. It's not uncommon for platforms to have IRQ routing problems, either due to a buggy MSI implementation in the bridge or because the ACPI routing info is wrong. James's new API provides a way for drivers to get some information when they don't receive an interrupt they expected, which should allow drivers to fall back and continue working, as well as improving our MSI blacklist. Thanks, Jesse James Bottomley (1): PCI: add routines for debugging and handling lost interrupts Kenji Kaneshige (1): PCI hotplug: cpqphp: fix kernel NULL pointer dereference Taku Izumi (3): PCI hotplug: pciehp: message refinement PCI hotplug: shpchp: replace printk with dev_printk PCI hotplug: shpchp: message refinement Zhao, Yu (2): PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems PCI: remove unused resource assignment in pci_read_bridge_bases() drivers/pci/Makefile | 3 +- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/hotplug/pciehp.h | 2 +- drivers/pci/hotplug/pciehp_core.c | 38 +++++---- drivers/pci/hotplug/pciehp_ctrl.c | 64 ++++++++-------- drivers/pci/hotplug/pciehp_hpc.c | 43 ++++------ drivers/pci/hotplug/pciehp_pci.c | 19 ++--- drivers/pci/hotplug/shpchp.h | 22 +++++- drivers/pci/hotplug/shpchp_core.c | 48 +++++++---- drivers/pci/hotplug/shpchp_ctrl.c | 158 +++++++++++++++++++++---------------- drivers/pci/hotplug/shpchp_hpc.c | 113 +++++++++++++------------- drivers/pci/hotplug/shpchp_pci.c | 36 +++++---- drivers/pci/irq.c | 60 ++++++++++++++ drivers/pci/pci.c | 21 +++-- drivers/pci/probe.c | 3 - include/linux/pci.h | 7 ++ 16 files changed, 376 insertions(+), 263 deletions(-) create mode 100644 drivers/pci/irq.c -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html