Thread (14 messages) 14 messages, 4 authors, 2013-02-21

Re: linux-next: build failure after merge of the xen-two tree

From: Rafael J. Wysocki <hidden>
Date: 2013-02-15 14:47:07
Also in: lkml

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 [off-list ref] wrote:
quoted
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.
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help