linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	linux-next@vger.kernel.org, Shaohua Li <shaohua.li@intel.com>
Subject: Re: linux-next: driver-core/pci merge failure
Date: Tue, 20 May 2008 00:39:59 +0200	[thread overview]
Message-ID: <200805200039.59938.rjw@sisk.pl> (raw)
In-Reply-To: <20080519152243.GB7620@kroah.com>

On Monday, 19 of May 2008, Greg KH wrote:
> 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?

Yes, please.  I'll send the updated patch to Jesse, if he doesn't object, as I
said in the other thread.

Thanks,
Rafael

  reply	other threads:[~2008-05-19 22:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-19  2:03 linux-next: driver-core/pci merge failure Stephen Rothwell
2008-05-19 14:25 ` Rafael J. Wysocki
2008-05-19 15:22   ` Greg KH
2008-05-19 22:39     ` Rafael J. Wysocki [this message]
2008-05-20  5:31       ` Stephen Rothwell
2008-05-20 21:08         ` Jesse Barnes
2008-05-20 23:31           ` Greg KH
2008-05-20 23:40             ` Rafael J. Wysocki
2008-05-20 23:53             ` Jesse Barnes
2008-05-21  0:25               ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200805200039.59938.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=greg@kroah.com \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shaohua.li@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).