From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andi Kleen <andi@firstfloor•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the hwpoison tree with Linus' tree
Date: Fri, 8 Oct 2010 14:40:37 +1100 [thread overview]
Message-ID: <20101008144037.f487b6d7.sfr@canb.auug.org.au> (raw)
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/
next reply other threads:[~2010-10-08 3:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-08 3:40 Stephen Rothwell [this message]
2010-10-08 6:11 ` linux-next: manual merge of the hwpoison tree with Linus' tree Andi Kleen
-- strict thread matches above, loose matches on Subject: below --
2009-12-16 5:21 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101008144037.f487b6d7.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andi@firstfloor$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox