From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Borislav Petkov <borislav.petkov@amd.com>,
Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Subject: linux-next: manual merge of the i7300_edac tree with Linus' tree
Date: Mon, 8 Aug 2011 13:48:08 +1000 [thread overview]
Message-ID: <20110808134808.263962c573bcffac2e28a003@canb.auug.org.au> (raw)
Hi Mauro,
Today's linux-next merge of the i7300_edac tree got a conflict in
arch/x86/kernel/cpu/mcheck/mce.c between commit b77e70bf3535 ("x86, mce:
Replace MCE_SELF_VECTOR by irq_work") from Linus' tree and commit
cd90cc84c6bf ("i7core_edac: Drop the edac_mce facility") from the
i7300_edac tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kernel/cpu/mcheck/mce.c
index 08363b0,9c03d98..0000000
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@@ -36,10 -37,12 +36,9 @@@
#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/debugfs.h>
- #include <linux/edac_mce.h>
+#include <linux/irq_work.h>
#include <asm/processor.h>
-#include <asm/hw_irq.h>
-#include <asm/apic.h>
-#include <asm/idle.h>
-#include <asm/ipi.h>
#include <asm/mce.h>
#include <asm/msr.h>
next reply other threads:[~2011-08-08 3:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-08 3:48 Stephen Rothwell [this message]
2011-08-08 7:24 ` linux-next: manual merge of the i7300_edac tree with Linus' tree Borislav Petkov
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=20110808134808.263962c573bcffac2e28a003@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=borislav.petkov@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=seto.hidetoshi@jp.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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