Hi all,

Today's linux-next merge of the kvm-riscv tree got a conflict in:

  include/uapi/linux/kvm.h

between commit:

  a7484c80e5ca ("KVM: arm64: Allow userspace to request KVM_ARM_VCPU_EL2*")

from the kvm-arm tree and commit:

  5b9db9c16f42 ("RISC-V: KVM: add KVM_CAP_RISCV_MP_STATE_RESET")

from the kvm-riscv 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/uapi/linux/kvm.h
index e6ed559d9091,454b7d4a0448..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -931,8 -930,7 +931,9 @@@ struct kvm_enable_cap 
  #define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237
  #define KVM_CAP_X86_GUEST_MODE 238
  #define KVM_CAP_ARM_WRITABLE_IMP_ID_REGS 239
 -#define KVM_CAP_RISCV_MP_STATE_RESET 240
 +#define KVM_CAP_ARM_EL2 240
 +#define KVM_CAP_ARM_EL2_E2H0 241
++#define KVM_CAP_RISCV_MP_STATE_RESET 242
  
  struct kvm_irq_routing_irqchip {
  	__u32 irqchip;