[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <556856C9.7040102@redhat.com>
Date: Fri, 29 May 2015 14:08:41 +0200
From: Paolo Bonzini <pbonzini@...hat.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
Marcelo Tosatti <mtosatti@...hat.com>,
Gleb Natapov <gleb@...nel.org>
CC: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>
Subject: Re: linux-next: build failure after merge of the kvm tree
-----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@...r.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-----
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists