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>

diff --cc arch/x86/include/asm/entry_arch.h
Simple merge

diff --cc arch/x86/include/asm/hardirq.h
Simple merge

diff --cc arch/x86/include/asm/hw_irq.h
Simple merge

diff --cc arch/x86/include/asm/irq_vectors.h
index 0ed29ac,8900ba4..4c2d2eb
--- 1/arch/x86/include/asm/irq_vectors.h
--- 2/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@@ -83,12 -102,6 +83,7 @@@
   */
  #define X86_PLATFORM_IPI_VECTOR               0xf7
  
- /* Vector for KVM to deliver posted interrupt IPI */
- #ifdef CONFIG_HAVE_KVM
- #define POSTED_INTR_VECTOR            0xf2
 +#define POSTED_INTR_WAKEUP_VECTOR     0xf1
- #endif
- 
  /*
   * IRQ work vector:
   */

diff --cc arch/x86/include/uapi/asm/msr-index.h
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/irq.c
Simple merge

diff --cc arch/x86/kernel/irqinit.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge