Subject: linux-next: manual merge of the kmemcheck tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 21 Oct 2008 16:15:05 +1100

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
include/linux/mm_types.h between commit
52d4b9ac0b985168009c2a57098324e67bae171f ("memcg: allocate all
page_cgroup at boot") from Linus' tree and commit
385e31b9eae0528bada07d16a189f3f40df23961 ("kmemcheck: add the kmemcheck
core") from the kmemcheck tree.

Just changed context.  I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

diff --cc include/linux/mm_types.h
index fe82547,bca924a..0000000
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@@ -94,6 -94,13 +94,10 @@@ struct page 
  	void *virtual;			/* Kernel virtual address (NULL if
  					   not kmapped, ie. highmem) */
  #endif /* WANT_PAGE_VIRTUAL */
 -#ifdef CONFIG_CGROUP_MEM_RES_CTLR
 -	unsigned long page_cgroup;
 -#endif
+ 
+ #ifdef CONFIG_KMEMCHECK
+ 	void *shadow;
+ #endif
  };
  
  /*