Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1248322 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-10-16 06:00 +0200 |
| Last post | 2015-10-16 06:30 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the kvm-arm tree with the kvm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-16 06:00 +0200
RE: linux-next: manual merge of the kvm-arm tree with the kvm tree "Wu, Feng" <feng.wu@intel.com> - 2015-10-16 06:30 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-10-16 06:00 +0200 |
| Subject | linux-next: manual merge of the kvm-arm tree with the kvm tree |
| Message-ID | <qk4lr-2Ff-1@gated-at.bofh.it> |
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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | "Wu, Feng" <feng.wu@intel.com> |
|---|---|
| Date | 2015-10-16 06:30 +0200 |
| Message-ID | <qk4Ou-3vj-3@gated-at.bofh.it> |
| In reply to | #1248322 |
> -----Original Message----- > From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] > Sent: Friday, October 16, 2015 11:53 AM > To: Christoffer Dall <cdall@cs.columbia.edu>; Marc Zyngier > <marc.zyngier@arm.com>; Marcelo Tosatti <mtosatti@redhat.com>; Gleb > Natapov <gleb@kernel.org>; kvm@vger.kernel.org > Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Wu, Feng > <feng.wu@intel.com>; Paolo Bonzini <pbonzini@redhat.com>; Christian > Borntraeger <borntraeger@de.ibm.com>; Cornelia Huck > <cornelia.huck@de.ibm.com> > Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks Stephen! Thanks, Feng -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web