Subject: Re: linux-next: build failure after merge of the kvm tree

From: Paolo Bonzini <[email-masked]>
Date: Fri, 29 May 2015 14:08:41 +0200

On 29/05/2015 09:36, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the kvm tree, today's linux-next build (x86_64 
> allmodconfig) failed like this:
> 
> arch/x86/kvm/cpuid.c: In function 'kvm_update_cpuid': 
> arch/x86/kvm/cpuid.c:98:2: error: implicit declaration of function 
> 'use_eager_fpu' [-Werror=implicit-function-declaration] 
> vcpu->arch.eager_fpu = use_eager_fpu() || 
> guest_cpuid_has_mpx(vcpu); ^
> 
> Caused by a bad automatic merge resolution which didn't add the 
> includes of one of its parents.

Thanks; I'll wait for Ingo's 4.1 FPU changes to land, and then note
the semantic conflict in my own pull request.

Also can you please add me and [email-masked] to the list of
addresses that are notified about the KVM tree in linux-next?

Regards,

Paolo