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

["Rafael J. Wysocki" <rjw@xxxxxxx>]

On Wednesday, February 20, 2013 03:49:41 PM Konrad Rzeszutek Wilk wrote:
> > > > commit 3757b94802fb65d8f696597a74053cf21738da0b
> > > > Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> > > > 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, but those new changes will only make sense after merging the Xen 
> > tree
> > with the PM tree.  Why don't we queue them up for merging later after both
> > the Xen and PM trees have been pulled from?
> 
> OK, I've created a branch 
> (http://git.kernel.org/?p=linux/kernel/git/konrad/xen.git;a=shortlog;h=refs/heads/linux-next-resolved)
> that has your branch and my branch - along with the fix from Stephan and then
> the three updates from Jinsong. Jinsong, please check that I've got all the
> right patches. I will rebase it once Linus has merged both of the Xen and PM 
> trees.

Thanks, this looks good.

Rafael


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

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel