From: "Liu, Jinsong" <jinsong.liu@intel•com>
To: "Rafael J. Wysocki" <rjw@sisk•pl>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
Cc: "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: Sun, 17 Feb 2013 07:31:37 +0000 [thread overview]
Message-ID: <DE8DF0795D48FD4CA783C40EC82923353FCCAC@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <11850955.SHqxVBsJqI@vostro.rjw.lan>
Rafael J. Wysocki wrote:
> On Saturday, February 16, 2013 01:52:00 AM Stephen Rothwell wrote:
>> Hi Rafael,
>
> Hi,
>
>> 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.
>
> Well, I'm afraid this won't be sufficient this time, because of this
> commit in my tree (which is not on the acpi-scan branch):
>
> commit 3757b94802fb65d8f696597a74053cf21738da0b
> Author: Rafael J. Wysocki <rafael.j.wysocki@intel•com>
> Date: Wed Feb 13 14:36:47 2013 +0100
>
> ACPI / hotplug: Fix concurrency issues and memory leaks
>
> after which acpi_bus_scan() and acpi_bus_trim() have to be run under
> acpi_scan_lock (new in my tree as well).
Yes, we noticed that and only need minor updates at xen side, will send out 2 xen patches later accordingly, for cleanup and adding lock.
Thanks,
Jinsong
>
> Moreover, I think that the introduction of ACPI-based CPU hotplug
> into Xen and this point would be premature, because we need to rework
> the original ACPI-based CPU hotplug and quite frankly it shouldn't
> call acpi_bus_scan() directly at all.
>
> Konrad?
>
> Thanks,
> Rafael
next prev parent reply other threads:[~2013-02-17 7:31 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
2013-02-16 20:11 ` Rafael J. Wysocki
2013-02-17 7:31 ` Liu, Jinsong [this message]
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=DE8DF0795D48FD4CA783C40EC82923353FCCAC@SHSMSX101.ccr.corp.intel.com \
--to=jinsong.liu@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