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

From: Stephen Rothwell
Date: Sun Feb 24 2013 - 17:48:53 EST

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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc mm/page_alloc.c
index e9075fd,4c99cb7..0000000
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -332,8 -319,8 +332,8 @@@ static void bad_page(struct page *page
/* Leave bad fields for debug, except PageBuddy could make trouble */
- reset_page_mapcount(page); /* remove PageBuddy */
+ page_mapcount_reset(page); /* remove PageBuddy */
- add_taint(TAINT_BAD_PAGE);


Attachment: pgp00000.pgp
Description: PGP signature