Re: linux-next: driver-core/pci merge failure

[Greg KH <greg@kroah.com>]

On Mon, May 19, 2008 at 04:25:02PM +0200, Rafael J. Wysocki wrote:
> On Monday, 19 of May 2008, Stephen Rothwell wrote:
> > 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.
> 
> Well, it's not really obvious. :-)
> 
> Please revert "PM: New suspend and hibernation callbacks for PCI bus type"
> until we fix that up.

Do you want me to drop this from my tree?

thanks,

greg k-h