From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: driver-core/pci merge failure Date: Mon, 19 May 2008 08:22:43 -0700 Message-ID: <20080519152243.GB7620@kroah.com> References: <20080519120328.40aa6d5d.sfr@canb.auug.org.au> <200805191625.02966.rjw@sisk.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from pentafluge.infradead.org ([213.146.154.40]:47276 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751211AbYESPXs (ORCPT ); Mon, 19 May 2008 11:23:48 -0400 Content-Disposition: inline In-Reply-To: <200805191625.02966.rjw@sisk.pl> Sender: linux-next-owner@vger.kernel.org List-ID: To: "Rafael J. Wysocki" Cc: Stephen Rothwell , Jesse Barnes , linux-next@vger.kernel.org, Shaohua Li 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