Re: [Xen-devel] linux-next: build failure after merge of the xen-two tree

["Liu, Jinsong" <jinsong.liu@xxxxxxxxx>]

Stephen Rothwell wrote:
> Hi Rafael,
> 
> On Fri, 15 Feb 2013 15:53:34 +0100 "Rafael J. Wysocki" <rjw@xxxxxxx>
> 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@xxxxxxxxxx> 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
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel