From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756014AbbE2MI6 (ORCPT ); Fri, 29 May 2015 08:08:58 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:36357 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755981AbbE2MIr (ORCPT ); Fri, 29 May 2015 08:08:47 -0400 Message-ID: <556856C9.7040102@redhat.com> Date: Fri, 29 May 2015 14:08:41 +0200 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Stephen Rothwell , Marcelo Tosatti , Gleb Natapov CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Subject: Re: linux-next: build failure after merge of the kvm tree References: <20150529173648.61bf6592@canb.auug.org.au> In-Reply-To: <20150529173648.61bf6592@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 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 kvm@vger.kernel.org to the list of addresses that are notified about the KVM tree in linux-next? Regards, Paolo -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJVaFbHAAoJEL/70l94x66DaAEIAINFmHxlKGpajfWibnDqc4yW AEuqFlN02JYNTUL+ZPXEpnjYT2eHnZUm+Q3BcwewnsoHcJL+KKKnHkNLlJQCpBc5 iBPPZQvMsbExEF7NsHDioPiZj1BK9IcQQOejRatEystOO9r9Mmw42L09t2M/+lUo iIoDjpgUp/BegMqC4c3xG682k5v+jH+UIqsBUy7OWvfbTF7Eej98wUXpuuw/rfLU 1JLM9gUo7CEUWYhjH9LfymQ84pFM0iQ7sEm1VUOmxwaRJ2EqF6AueyKB2uqqgGY/ a5uYx88AVMT2wxBpMhsnM9OMkGqZ8uykWAiWhgIhX6JR6Ygk+OgC+d2sKsREQgc= =PRiY -----END PGP SIGNATURE-----