* linux-next: manual merge of the i7300_edac tree with Linus' tree
@ 2011-08-08 3:48 Stephen Rothwell
2011-08-08 7:24 ` Borislav Petkov
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-08-08 3:48 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Borislav Petkov, Hidetoshi Seto
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the i7300_edac tree with Linus' tree
2011-08-08 3:48 linux-next: manual merge of the i7300_edac tree with Linus' tree Stephen Rothwell
@ 2011-08-08 7:24 ` Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: Borislav Petkov @ 2011-08-08 7:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel, Hidetoshi Seto
On Sun, Aug 07, 2011 at 11:48:08PM -0400, Stephen Rothwell wrote:
> 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>
Yeah, that looks ok.
Thanks Stephen.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-08 7:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-08 3:48 linux-next: manual merge of the i7300_edac tree with Linus' tree Stephen Rothwell
2011-08-08 7:24 ` Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).