Re: linux-next: build failure after merge of the xen-two tree
From: Rafael J. Wysocki
Date: Fri Feb 15 2013 - 09:47:15 EST
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 <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
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/