Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/x86/kvm/x86.c
between commit:
127770ac0d043 ("KVM: x86: Add KVM_CAP_ENABLE_CAP to x86")
from the kvm-fixes tree and commit:
8a2897853c53f ("KVM: x86: return 1 unconditionally for availability of KVM_CAP_VAPIC")
from the kvm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc arch/x86/kvm/x86.c
index 8a66d10c7a8dc,16d29d41908fa..0000000000000
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -4245,7 -4235,7 +4247,8 @@@ int kvm_vm_ioctl_check_extension(struc
case KVM_CAP_EXIT_ON_EMULATION_FAILURE:
case KVM_CAP_VCPU_ATTRIBUTES:
case KVM_CAP_SYS_ATTRIBUTES:
+ case KVM_CAP_ENABLE_CAP:
+ case KVM_CAP_VAPIC:
r = 1;
break;
case KVM_CAP_EXIT_HYPERCALL:
