* Re: next-20160724 build: 2 failures 6 warnings (next-20160724) [not found] <E1bRHH2-0004tC-9F@optimist> @ 2016-07-24 19:59 ` Arnd Bergmann 2016-07-24 20:12 ` Marc Zyngier 0 siblings, 1 reply; 2+ messages in thread From: Arnd Bergmann @ 2016-07-24 19:59 UTC (permalink / raw) To: linaro-kernel Cc: Build bot for Mark Brown, kernel-build-reports, linux-next, Eric Auger, Marc Zyngier, Radim Krčmář, Paolo Bonzini, kvm 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. Arnd ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: next-20160724 build: 2 failures 6 warnings (next-20160724) 2016-07-24 19:59 ` next-20160724 build: 2 failures 6 warnings (next-20160724) Arnd Bergmann @ 2016-07-24 20:12 ` Marc Zyngier 0 siblings, 0 replies; 2+ messages in thread From: Marc Zyngier @ 2016-07-24 20:12 UTC (permalink / raw) To: Arnd Bergmann Cc: linaro-kernel, Build bot for Mark Brown, kernel-build-reports, linux-next, Eric Auger, Radim Krčmář, Paolo Bonzini, kvm 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. ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-24 20:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1bRHH2-0004tC-9F@optimist>
2016-07-24 19:59 ` next-20160724 build: 2 failures 6 warnings (next-20160724) Arnd Bergmann
2016-07-24 20:12 ` Marc Zyngier
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox