* linux-next: manual merge of the hwpoison tree with Linus' tree
@ 2009-12-16 5:21 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-12-16 5:21 UTC (permalink / raw)
To: Andi Kleen
Cc: linux-next, linux-kernel, Wu Fengguang, Hugh Dickins,
Andrew Morton
Hi Andi,
Today's linux-next merge of the hwpoison tree got a conflict in
mm/memcontrol.c between commit 407f9c8b0889ced1dbe2f9157e4e60c61329d5c9
("ksm: mem cgroup charge swapin copy") from Linus' tree and commit
eacbcea706766709f5c3bbbca208c04558a8d72f ("memcg: rename and export
try_get_mem_cgroup_from_page()") from the hwpoison tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc mm/memcontrol.c
index e0c2066,4e51af7..0000000
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -1737,13 -1739,12 +1739,13 @@@ int mem_cgroup_try_charge_swapin(struc
goto charge_cur_mm;
/*
* A racing thread's fault, or swapoff, may have already updated
- * the pte, and even removed page from swap cache: return success
- * to go on to do_swap_page()'s pte_same() test, which should fail.
+ * the pte, and even removed page from swap cache: in those cases
+ * do_swap_page()'s pte_same() test will fail; but there's also a
+ * KSM case which does need to charge the page.
*/
if (!PageSwapCache(page))
- return 0;
+ goto charge_cur_mm;
- mem = try_get_mem_cgroup_from_swapcache(page);
+ mem = try_get_mem_cgroup_from_page(page);
if (!mem)
goto charge_cur_mm;
*ptr = mem;
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the hwpoison tree with Linus' tree
@ 2010-10-08 3:40 Stephen Rothwell
2010-10-08 6:11 ` Andi Kleen
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-10-08 3:40 UTC (permalink / raw)
To: Andi Kleen; +Cc: linux-next, linux-kernel
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 sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the hwpoison tree with Linus' tree
2010-10-08 3:40 linux-next: manual merge of the hwpoison tree with Linus' tree Stephen Rothwell
@ 2010-10-08 6:11 ` Andi Kleen
0 siblings, 0 replies; 3+ messages in thread
From: Andi Kleen @ 2010-10-08 6:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Andi Kleen, linux-next, linux-kernel
On Fri, Oct 08, 2010 at 02:40:37PM +1100, Stephen Rothwell wrote:
> 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
Yes I did a rebase here.
> Linus' tree (since it was committed later). The conflict looked like this:
I will rebase the tree. Thanks for catching.
-Andi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-08 6:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-08 3:40 linux-next: manual merge of the hwpoison tree with Linus' tree Stephen Rothwell
2010-10-08 6:11 ` Andi Kleen
-- strict thread matches above, loose matches on Subject: below --
2009-12-16 5:21 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox