On Sun, 24 Jul 2016 21:59:31 +0200 Arnd Bergmann <arnd@xxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
