LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Liu Jinsong <jinsong.liu@intel.com>
Subject: Re: linux-next: build failure after merge of the xen-two tree
Date: Fri, 15 Feb 2013 15:53:34 +0100	[thread overview]
Message-ID: <2185970.g9YrD945My@vostro.rjw.lan> (raw)
In-Reply-To: <20130216005014.c8ce70e041f655d4c195c9fb@canb.auug.org.au>

On Saturday, February 16, 2013 12:50:14 AM Stephen Rothwell wrote:
> Hi Konrad,
> 
> On Fri, 15 Feb 2013 08:26:24 -0500 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> wrote:
> >
> > Thank you. I keep on forgetting - but would it be OK for me to take this
> > patch in my tree? Or should I not since this is a new functionality that
> > Rafael is going to introduce in v3.9?
> 
> It is an API change in the pm tree that is not yet in Linus' tree.
> 
> > And if so, perhaps I should tack it on in my tree, once Rafael does a git
> > pull to Linus? Or just point Linus to this git commit?
> 
> You should point Linus at this patch if the pm tree is merged first, or
> Rafael should do the same if the reverse happens.

Alternatively, Konrad can pull the acpi-scan branch containing the changes
in question from my tree into his tree and rebase the new material on top
of that.

Thanks,
Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

  reply	other threads:[~2013-02-15 14:47 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-15  4:45 Stephen Rothwell
2013-02-15 13:26 ` Konrad Rzeszutek Wilk
2013-02-15 13:50   ` Stephen Rothwell
2013-02-15 14:53     ` Rafael J. Wysocki [this message]
2013-02-15 14:52       ` Stephen Rothwell
2013-02-15 17:46         ` Liu, Jinsong
2013-02-16 20:11         ` Rafael J. Wysocki
2013-02-17  7:31           ` Liu, Jinsong
2013-02-17 14:08             ` Rafael J. Wysocki
2013-02-20 20:49               ` Konrad Rzeszutek Wilk
2013-02-20 21:24                 ` Rafael J. Wysocki
2013-02-21  6:40                 ` Liu, Jinsong
2013-02-15 17:20   ` Liu, Jinsong
2013-02-15 17:08 ` Liu, Jinsong
  -- strict thread matches above, loose matches on Subject: below --
2013-02-04  4:14 Stephen Rothwell
2013-02-05 18:30 ` Konrad Rzeszutek Wilk
2013-03-02 15:39   ` Stephen Rothwell
2012-10-02  4:33 Stephen Rothwell
2011-02-10  4:46 Stephen Rothwell
2011-02-10 12:24 ` Thomas Gleixner
2011-02-10 15:22   ` Konrad Rzeszutek Wilk

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=2185970.g9YrD945My@vostro.rjw.lan \
    --to=rjw@sisk.pl \
    --cc=jinsong.liu@intel.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --subject='Re: linux-next: build failure after merge of the xen-two tree' \
    /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

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).