Hi Ingo,
Today's linux-next merge of the sparseirq tree got a trivial conflict in
arch/x86/kvm/vmx.h and include/asm-x86/msr-index.h between commit
f5dd05a1980ab0770f1889fbc3ad2daa5ff89d6d ("x86: Move FEATURE_CONTROL bits
to msr-index.h") from the kvm tree and commit
315a6558f30a264c88274fa70626615d1c7851c7 ("x86: move VMX MSRs to
msr-index.h") from the sparseirq tree.
Just context changes. I fixed it up and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpIPDg8Gne2o.pgp
Description: PGP signature
