git.cascardo.info Git - cascardo/linux.git/commit

Merge branch 'x86/ras' into x86/core, to fix conflicts

Conflicts:
arch/x86/include/asm/irq_vectors.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Unnamed repository; edit this file 'description' to name the repository.

arch/x86/include/asm/entry_arch.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hardirq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history