Re: linux-next: manual merge of the metag tree with Linus' tree

From: James Hogan
Date: Mon Feb 25 2013 - 04:50:55 EST

On 24/02/13 22:48, Stephen Rothwell wrote:
> Hi James,
> Today's linux-next merge of the metag tree got a conflict in
> mm/page_alloc.c between commit 22b751c3d037 ("mm: rename page struct
> field helpers") from Linus' tree and commit 373d4d099761 ("taint: add
> explicit flag to show whether lock dep is still OK") from the metag tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Hi Stephen,

Looks good to me.


Attachment: signature.asc
Description: OpenPGP digital signature