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

From: Stephen Rothwell
Date: Fri Feb 15 2013 - 09:52:14 EST

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.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature