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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 8 Oct 2010 14:40:37 +1100

Hi Andi,

Today's linux-next merge of the hwpoison tree got a conflict in
mm/memory-failure.c between commit
0d9ee6a2d4a6e92c49e6fa9469e5731d21ee203e ("HWPOISON: Report correct
address granuality for AO huge page errors") from Linus' tree and commit
3c5ca5455796841ac3cd706a91ba8dada908c375 ("HWPOISON: Report correct
address granuality for AO huge page errors") from the hwpoison tree.

Slightly different versions of the same patch.  I used the version from
Linus' tree (since it was committed later).  The conflict looked like this:

diff --cc mm/memory-failure.c
index 757f6b0,0966b6a..0000000
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@@ -198,7 -203,8 +203,12 @@@ static int kill_proc_ao(struct task_str
  #ifdef __ARCH_SI_TRAPNO
  	si.si_trapno = trapno;
  #endif
++<<<<<<< HEAD
 +	si.si_addr_lsb = compound_order(compound_head(page)) + PAGE_SHIFT;
++=======
+ 	order = PageCompound(page) ? huge_page_order(page) : PAGE_SHIFT;
+ 	si.si_addr_lsb = order;
++>>>>>>> hwpoison/hwpoison
  	/*
  	 * Don't use force here, it's convenient if the signal
  	 * can be temporarily blocked.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/