linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	Gleb Natapov <gleb@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: build failure after merge of the kvm tree
Date: Fri, 29 May 2015 14:08:41 +0200	[thread overview]
Message-ID: <556856C9.7040102@redhat.com> (raw)
In-Reply-To: <20150529173648.61bf6592@canb.auug.org.au>

-----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-----

  parent reply	other threads:[~2015-05-29 12:08 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29  7:36 linux-next: build failure after merge of the kvm tree Stephen Rothwell
2015-05-29  7:54 ` Ingo Molnar
2015-05-29 12:08 ` Paolo Bonzini [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-12  3:34 Stephen Rothwell
2024-04-12  3:35 ` Stephen Rothwell
2024-04-12 12:14   ` Paolo Bonzini
2023-11-22  2:14 Stephen Rothwell
2023-11-20  4:22 Stephen Rothwell
2023-12-11  2:50 ` Stephen Rothwell
2022-04-19  5:34 Stephen Rothwell
2022-04-19 16:01 ` Sean Christopherson
2022-04-19 16:09   ` Paolo Bonzini
2022-04-21 18:06   ` Paolo Bonzini
2022-04-27  3:23 ` Stephen Rothwell
2022-04-27  6:06   ` Paolo Bonzini
2021-02-08  5:33 Stephen Rothwell
2021-02-08 11:18 ` Yu Zhang
2021-02-05  5:02 Stephen Rothwell
2021-02-05 10:08 ` Paolo Bonzini
2021-02-07 19:48   ` Stephen Rothwell
2021-02-09  4:56     ` Stephen Rothwell
2020-07-17  5:57 Stephen Rothwell
2020-07-29  7:06 ` Stephen Rothwell
2020-05-21  6:28 Stephen Rothwell
2020-06-04  2:54 ` Stephen Rothwell
2019-02-18  3:42 Stephen Rothwell
2019-02-19 15:36 ` Sean Christopherson
2019-02-19 18:17   ` Paolo Bonzini
2018-12-19  4:33 Stephen Rothwell
2017-02-08  3:23 Stephen Rothwell
2016-12-19  1:11 Stephen Rothwell
2015-09-08  1:35 Stephen Rothwell
2015-09-08  2:10 ` Wanpeng Li
2015-09-08  9:24   ` Paolo Bonzini
2014-11-24  6:19 Stephen Rothwell
2014-11-24  9:38 ` Paolo Bonzini
2014-08-06  4:39 Stephen Rothwell
2014-03-11 23:55 Mark Brown
2014-01-10  3:00 Stephen Rothwell
2014-01-17  4:03 ` Stephen Rothwell
2012-08-23  3:21 Stephen Rothwell
2012-03-06  4:53 Stephen Rothwell
2012-03-06 10:34 ` Avi Kivity
2010-08-30  1:35 Stephen Rothwell
2010-08-30 10:03 ` Alexander Graf
2010-08-30 10:56   ` Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=556856C9.7040102@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=gleb@kernel.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mtosatti@redhat.com \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).