From: "Liu, Jinsong" <jinsong.liu@intel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
"Rafael J. Wysocki" <rjw@sisk•pl>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
Cc: "Wu, Fengguang" <fengguang.wu@intel•com>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"xen-devel@lists•xensource.com" <xen-devel@lists•xensource.com>
Subject: RE: linux-next: build failure after merge of the xen-two tree
Date: Fri, 15 Feb 2013 17:46:48 +0000 [thread overview]
Message-ID: <DE8DF0795D48FD4CA783C40EC82923353FC036@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <20130216015200.1e58bec1aff05592ac2ae98f@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Rafael,
>
> On Fri, 15 Feb 2013 15:53:34 +0100 "Rafael J. Wysocki" <rjw@sisk•pl>
> wrote:
>>
>> On Saturday, February 16, 2013 12:50:14 AM Stephen Rothwell wrote:
>>>
>>> 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.
>
> Or pull the acpi-scan branch into his tree and use my conflict
> resolution in the resulting merge thus requiring no rebasing.
> However, Linus likes to see such interactions, so it can be left up
> to when the latter of the two tress is merged by Linus.
Per my understanding, currently in git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git, it has included
1). 636458de36f1, 0cd6ac52b333, b8bd759acd05: from pm tree (Rafael), drop acpi_bus_add, update argument of acpi_bus_scan
2). 259f201cb7ea, 181232c249f0: from xen tree (Jinsong), use acpi_bus_add
3). 36bd3c64bfe2 Stephen fix confliction of 1) and 2)
Currently these are only some compiling warning left, so the only thing need to do is to add my patch to fix compile warning (just sent out minutes ago) to the top of git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git ?
Thanks,
Jinsong
next prev parent reply other threads:[~2013-02-15 17:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-15 4:45 linux-next: build failure after merge of the xen-two tree 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
2013-02-15 14:52 ` Stephen Rothwell
2013-02-15 17:46 ` Liu, Jinsong [this message]
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=DE8DF0795D48FD4CA783C40EC82923353FC036@SHSMSX101.ccr.corp.intel.com \
--to=jinsong.liu@intel$(echo .)com \
--cc=fengguang.wu@intel$(echo .)com \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@sisk$(echo .)pl \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=xen-devel@lists$(echo .)xensource.com \
/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