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

[Mark Brown]

Hi all,

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

  include/uapi/linux/kvm.h

between commit:

  229132c309d66 ("LoongArch: KVM: Add DMSINTC device support")

from the loongarch tree and commit:

  c547c51ff4d44 ("KVM: arm64: gic-v5: Add ARM_VGIC_V5 device to KVM headers")

from the kvm-arm 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 include/uapi/linux/kvm.h
index 9e7887230bddc,ae659566e44f4..0000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1224,8 -1229,8 +1229,10 @@@ enum kvm_device_type 
  #define KVM_DEV_TYPE_LOONGARCH_EIOINTC	KVM_DEV_TYPE_LOONGARCH_EIOINTC
  	KVM_DEV_TYPE_LOONGARCH_PCHPIC,
  #define KVM_DEV_TYPE_LOONGARCH_PCHPIC	KVM_DEV_TYPE_LOONGARCH_PCHPIC
 +	KVM_DEV_TYPE_LOONGARCH_DMSINTC,
 +#define KVM_DEV_TYPE_LOONGARCH_DMSINTC	KVM_DEV_TYPE_LOONGARCH_DMSINTC
+ 	KVM_DEV_TYPE_ARM_VGIC_V5,
+ #define KVM_DEV_TYPE_ARM_VGIC_V5	KVM_DEV_TYPE_ARM_VGIC_V5
  
  	KVM_DEV_TYPE_MAX,

Attachment: signature.asc
Description: PGP signature