Re: linux-next: build failure after merge of the xen-two tree
From: Stephen Rothwell
Date: Fri Feb 15 2013 - 08:50:31 EST
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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature