Hi Greg, Jesse, Today's linux-next merge of the pci tree got a conflict in drivers/pci/pci-driver.c between commit 681e027ef934e9892b199180129be772208f735b ("PM: New suspend and hibernation callbacks for PCI bus type") from the driver-core tree and commit 176bc7cff4442d3795c0599b70ecbe9b11ccd775 ("Suspend/Resume bug in PCI layer wrt quirks") from the pci tree. The former changed pci_default_resume() to pci_default_pm_resume() while the latter added a call to pci_fixup_device() immediately after the call to pci_default_resume() in pci_device_resume() (which became pci_legacy_resume() in the former patch). I assume the obvious fixup is correct, but may be worth a check. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/