lkml.org 
[lkml]   [2015]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: 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@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-----


    \
     
     \ /
      Last update: 2015-05-29 14:41    [W:6.503 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site