[lkml]   [2011]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the i7300_edac tree with Linus' tree
    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
    Stephen Rothwell

    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>

     \ /
      Last update: 2011-08-08 05:51    [W:0.018 / U:186.948 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site