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

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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>
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/