linux-next: manual merge of the kvm-arm tree with the kvm tree

2015-10-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/x86/include/asm/kvm_host.h between commit: d84f1e0755ba ("KVM: make kvm_set_msi_irq() public") from the kvm tree and commits: 8feb4a04dc75 ("KVM: Define a new interface kvm_intr_is_single_vcpu()")

RE: linux-next: manual merge of the kvm-arm tree with the kvm tree

2015-10-15 Thread Wu, Feng
> Natapov <g...@kernel.org>; kvm@vger.kernel.org > Cc: linux-n...@vger.kernel.org; linux-ker...@vger.kernel.org; Wu, Feng > <feng...@intel.com>; Paolo Bonzini <pbonz...@redhat.com>; Christian > Borntraeger <borntrae...@de.ibm.com>; Cornelia Huck > <cornel