Messages in this thread Patch in this message | | | Date | Sat, 2 Feb 2013 16:52:01 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kvm tree with Linus' tree |
| |
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 and commits 83d4c286931c ("x86, apicv: add APICv register virtualization support") and c7c9c56ca26f ("x86, apicv: add virtual interrupt delivery support") from the kvm tree.
I fixed it up (by applying the merge fix patch below) and can carry the fix as necessary (no action is required).
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Sat, 2 Feb 2013 16:43:02 +1100 Subject: [PATCH] x86, apicv: merge fixup for uapi include file split
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/x86/include/uapi/asm/vmx.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/x86/include/uapi/asm/vmx.h b/arch/x86/include/uapi/asm/vmx.h index 979d03b..9a74505 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 \ -- 1.8.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |