From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752744AbbJPDxE (ORCPT ); Thu, 15 Oct 2015 23:53:04 -0400 Received: from ozlabs.org ([103.22.144.67]:33511 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751936AbbJPDxC (ORCPT ); Thu, 15 Oct 2015 23:53:02 -0400 Date: Fri, 16 Oct 2015 14:53:00 +1100 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Marcelo Tosatti , Gleb Natapov , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Feng Wu , Paolo Bonzini , Christian Borntraeger , Cornelia Huck Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20151016145300.7f03fbcb@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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()") 8fc52eb9cee4 ("KVM: Add kvm_arch_vcpu_{un}blocking callbacks") from the kvm-arm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/x86/include/asm/kvm_host.h index 53deb2750bf6,b926137d591f..000000000000 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@@ -1256,9 -1232,7 +1256,13 @@@ int x86_set_memory_region(struct kvm *k bool kvm_vcpu_is_reset_bsp(struct kvm_vcpu *vcpu); bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu); +bool kvm_intr_is_single_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq, + struct kvm_vcpu **dest_vcpu); + +void kvm_set_msi_irq(struct kvm_kernel_irq_routing_entry *e, + struct kvm_lapic_irq *irq); ++ + static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {} + static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {} + #endif /* _ASM_X86_KVM_HOST_H */