From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
linux-next@vger.kernel.org
Subject: Re: linux-next: driver-core/pci merge failure
Date: Tue, 20 May 2008 16:53:04 -0700 [thread overview]
Message-ID: <200805201653.04543.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <20080520233113.GA5053@kroah.com>
On Tuesday, May 20, 2008 4:31 pm Greg KH wrote:
> On Tue, May 20, 2008 at 02:08:44PM -0700, Jesse Barnes wrote:
> > On Monday, May 19, 2008 10:31 pm Stephen Rothwell wrote:
> > > Hi Rafael, Greg,
> > >
> > > On Tue, 20 May 2008 00:39:59 +0200 "Rafael J. Wysocki" <rjw@sisk.pl>
wrote:
> > > > On Monday, 19 of May 2008, Greg KH wrote:
> > > > > On Mon, May 19, 2008 at 04:25:02PM +0200, Rafael J. Wysocki wrote:
> > > > > > 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.
> > >
> > > I have reverted that patch in linux-next today. Let me know when
> > > things change.
> > >
> > > (I reverted in the import of the quilt tree, so it appears in
> > > quilt-import.log not merge.log.)
> >
> > Ok, I pushed the PCI PM ops patch into my linux-next tree, along with a
> > duplicate of the new PM ops patch (which is also in Greg's tree). This
> > would be slightly easier if Greg used git too, since then I could just
> > cherry pick the commit...
>
> It still would be a mess :)
Yeah, if the patches ended up getting replaced or rebased it could get ugly
(but remember, Linus says "don't do that!" :).
> As I no longer control the PCI tree, this just got more complex. I have
> no problem with you taking that patch in your tree, you can keep my
> signed-off-by.
>
> Rafael, I'll be dropping the following patches from my tree:
> driver-core/pm-introduce-new-top-level-suspend-and-hibernation-callbacks.p
>atch
> driver-core/pm-new-suspend-and-hibernation-callbacks-for-platform-bus-type.
>patch
> driver-core/pm-new-suspend-and-hibernation-callbacks-for-pci-bus-type.patch
>
> I'm guessing you want Jesse to also pick up the platform-bus one as
> well, so that does not get lost.
>
> Is that ok?
Sounds good, thanks Greg.
Jesse
next prev parent reply other threads:[~2008-05-20 23:59 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
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 [this message]
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=200805201653.04543.jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek.org \
--cc=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/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).