Subject: linux-next: manual merge of the kvm tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 15 Sep 2008 10:14:07 +1000

Hi Avi,

Today's linux-next merge of the kvm tree got a trivial conflict in
include/asm-x86/msr-index.h between commit
77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
guards") from the x86 tree and commit
370ad813e210ac91935c6b5fa2e9cf80a0305fad ("x86: Move VMX MSRs to
msr-index.h") from the kvm tree.

I fixed it up (see below) and can carry the fixup.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

diff --cc include/asm-x86/msr-index.h
index 3052f05,715f951..0000000
--- a/include/asm-x86/msr-index.h
+++ b/include/asm-x86/msr-index.h
@@@ -310,4 -314,19 +314,19 @@@
  /* Geode defined MSRs */
  #define MSR_GEODE_BUSCONT_CONF0		0x00001900
  
+ /* Intel VT MSRs */
+ #define MSR_IA32_VMX_BASIC              0x00000480
+ #define MSR_IA32_VMX_PINBASED_CTLS      0x00000481
+ #define MSR_IA32_VMX_PROCBASED_CTLS     0x00000482
+ #define MSR_IA32_VMX_EXIT_CTLS          0x00000483
+ #define MSR_IA32_VMX_ENTRY_CTLS         0x00000484
+ #define MSR_IA32_VMX_MISC               0x00000485
+ #define MSR_IA32_VMX_CR0_FIXED0         0x00000486
+ #define MSR_IA32_VMX_CR0_FIXED1         0x00000487
+ #define MSR_IA32_VMX_CR4_FIXED0         0x00000488
+ #define MSR_IA32_VMX_CR4_FIXED1         0x00000489
+ #define MSR_IA32_VMX_VMCS_ENUM          0x0000048a
+ #define MSR_IA32_VMX_PROCBASED_CTLS2    0x0000048b
+ #define MSR_IA32_VMX_EPT_VPID_CAP       0x0000048c
+ 
 -#endif /* __ASM_MSR_INDEX_H */
 +#endif /* ASM_X86__MSR_INDEX_H */