public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
	Andrew Morton <akpm@linux-foundation•org>,
	Ingo Molnar <mingo@elte•hu>,
	Jesse Barnes <jbarnes@virtuousgeek•org>
Subject: Re: New linux-next tree suspend-2.6
Date: Mon, 16 Mar 2009 23:16:10 +0100	[thread overview]
Message-ID: <200903162316.11139.rjw@sisk.pl> (raw)
In-Reply-To: <20090316200557.3542847a.sfr@canb.auug.org.au>

On Monday 16 March 2009, Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> On Mon, 16 Mar 2009 13:16:47 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > I notice that your resolution is to revert a patch from the pci tree.  As
> > an alternative, you could apply the pci tree patch to your tree.
> 
> Which I now see is exactly what you did.  This makes the resolution for
> me very easy as I just need to use your version of the changes.

Jesse is going to drop the conflicting patch from his tree, so this issue
will go away shortly.

Thanks,
Rafael

  reply	other threads:[~2009-03-16 22:16 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-15 16:54 New linux-next tree suspend-2.6 Rafael J. Wysocki
2009-03-16  2:16 ` Stephen Rothwell
2009-03-16  9:05   ` Stephen Rothwell
2009-03-16 22:16     ` Rafael J. Wysocki [this message]
2009-03-16 23:10       ` Stephen Rothwell
2009-03-16 22:13   ` Rafael J. Wysocki

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=200903162316.11139.rjw@sisk.pl \
    --to=rjw@sisk$(echo .)pl \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=jbarnes@virtuousgeek$(echo .)org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mingo@elte$(echo .)hu \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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