From: Marc Zyngier <marc.zyngier@arm.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linaro-kernel@lists.linaro.org,
"Build bot for Mark Brown" <broonie@kernel.org>,
kernel-build-reports@lists.linaro.org,
linux-next@vger.kernel.org, "Eric Auger" <eric.auger@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
kvm@vger.kernel.org
Subject: Re: next-20160724 build: 2 failures 6 warnings (next-20160724)
Date: Sun, 24 Jul 2016 21:12:32 +0100 [thread overview]
Message-ID: <20160724211232.6139b79f@arm.com> (raw)
In-Reply-To: <4278236.GOabnZUd2H@wuerfel>
On Sun, 24 Jul 2016 21:59:31 +0200
Arnd Bergmann <arnd@arndb.de> wrote:
> On Sunday, July 24, 2016 12:08:44 PM CEST Build bot for Mark Brown wrote:
> > Errors summary: 1
> > 2 ../arch/arm64/kvm/../../../virt/kvm/arm/vgic/vgic-irqfd.c:48:5: error: conflicting types for 'kvm_set_routing_entry'
> >
>
> This is a conflict between Eric Auger's "KVM: arm/arm64: Enable irqchip
> routing" in the kvm-arm tree and Radim Krčmář's "KVM: pass struct kvm to
> kvm_set_routing_entry" in the kvm tree.
>
> It just appeared in next-20160724.
I've pushed out a workaround this morning (so that it compiles both
on its own and with -next) after noticing the same thing. We'll be able
to remove it once that code gets merged.
Thanks,
M.
--
Jazz is not dead. It just smells funny.
prev parent reply other threads:[~2016-07-24 20:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-24 11:08 next-20160724 build: 2 failures 6 warnings (next-20160724) Build bot for Mark Brown
2016-07-24 19:59 ` Arnd Bergmann
2016-07-24 20:12 ` Marc Zyngier [this message]
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=20160724211232.6139b79f@arm.com \
--to=marc.zyngier@arm.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=eric.auger@redhat.com \
--cc=kernel-build-reports@lists.linaro.org \
--cc=kvm@vger.kernel.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-next@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
/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).