* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 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.
these changes will likely be driven from the KVM tree, so it should not
go beyond this initial conflict. (commit 77ef50a is already interwoven)
> I fixed it up (see below) and can carry the fixup.
thanks!
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
