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

From: Ingo Molnar <[email-masked]>
Date: Mon, 15 Sep 2008 08:53:16 +0200

* Stephen Rothwell <[email-masked]> 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