Hi all, Today's linux-next merge of the kvm tree got a conflict in arch/x86/include/asm/vmx.h between commit af170c5061dd ("UAPI: (Scripted) Disintegrate arch/x86/include/asm") from Linus' tree (v3.8-rc1) and commit b0da5bec30ec ("KVM: VMX: add missing exit names to VMX_EXIT_REASONS array") from the kvm tree. The section modified by the latter has been moved to arch/x86/include/uapi/asm/vmx.h, so my fix up patch for that file now is below and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Thu, 7 Feb 2013 14:15:07 +1100 Subject: [PATCH] x86, apicv: merge fixup for uapi include file split Signed-off-by: Stephen Rothwell --- arch/x86/include/uapi/asm/vmx.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/vmx.h b/arch/x86/include/uapi/asm/vmx.h index 979d03b..2871fcc 100644 --- a/arch/x86/include/uapi/asm/vmx.h +++ b/arch/x86/include/uapi/asm/vmx.h @@ -62,10 +62,12 @@ #define EXIT_REASON_MCE_DURING_VMENTRY 41 #define EXIT_REASON_TPR_BELOW_THRESHOLD 43 #define EXIT_REASON_APIC_ACCESS 44 +#define EXIT_REASON_EOI_INDUCED 45 #define EXIT_REASON_EPT_VIOLATION 48 #define EXIT_REASON_EPT_MISCONFIG 49 #define EXIT_REASON_WBINVD 54 #define EXIT_REASON_XSETBV 55 +#define EXIT_REASON_APIC_WRITE 56 #define EXIT_REASON_INVPCID 58 #define VMX_EXIT_REASONS \ @@ -103,7 +105,12 @@ { EXIT_REASON_APIC_ACCESS, "APIC_ACCESS" }, \ { EXIT_REASON_EPT_VIOLATION, "EPT_VIOLATION" }, \ { EXIT_REASON_EPT_MISCONFIG, "EPT_MISCONFIG" }, \ - { EXIT_REASON_WBINVD, "WBINVD" } + { EXIT_REASON_WBINVD, "WBINVD" }, \ + { EXIT_REASON_APIC_WRITE, "APIC_WRITE" }, \ + { EXIT_REASON_EOI_INDUCED, "EOI_INDUCED" }, \ + { EXIT_REASON_INVALID_STATE, "INVALID_STATE" }, \ + { EXIT_REASON_INVD, "INVD" }, \ + { EXIT_REASON_INVPCID, "INVPCID" } #endif /* _UAPIVMX_H */ -- 1.8.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au