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

From: Stephen Rothwell
Date: Sun Dec 07 2014 - 18:55:31 EST


Hi Christian,

On Sun, 07 Dec 2014 22:16:41 +0100 Christian Borntraeger <borntraeger@xxxxxxxxxx> wrote:
>
> I also did an additional check and merged this tree with linux-next/master. This introduced a new problem.
> The fix is simple, see patch. But I am not sure how to add that to next (via my tree), since this change is only in next.

OK, thanks for that. I will apply that patch as a merge fix to my tree
when I merge your tree. You (or the owner of the conflicting tree)
will need to let Linus know when the merge happens in his tree.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgppA6j0Z9SjR.pgp
Description: OpenPGP digital signature