linux-next: manual merge of the kvm-riscv tree with the risc-v tree

[Stephen Rothwell]

Hi all,

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

  arch/riscv/include/uapi/asm/kvm.h

between commit:

  1851e7836212 ("RISC-V: KVM: Allow Smnpm and Ssnpm extensions for guests")

from the risc-v tree and commit:

  97eccf7db4f2 ("RISC-V: KVM: Add Svade and Svadu Extensions Support for Guest/VM")

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 arch/riscv/include/uapi/asm/kvm.h
index 4f24201376b1,85bbc472989d..000000000000
--- a/arch/riscv/include/uapi/asm/kvm.h
+++ b/arch/riscv/include/uapi/asm/kvm.h
@@@ -175,8 -175,8 +175,10 @@@ enum KVM_RISCV_ISA_EXT_ID 
  	KVM_RISCV_ISA_EXT_ZCF,
  	KVM_RISCV_ISA_EXT_ZCMOP,
  	KVM_RISCV_ISA_EXT_ZAWRS,
 +	KVM_RISCV_ISA_EXT_SMNPM,
 +	KVM_RISCV_ISA_EXT_SSNPM,
+ 	KVM_RISCV_ISA_EXT_SVADE,
+ 	KVM_RISCV_ISA_EXT_SVADU,
  	KVM_RISCV_ISA_EXT_MAX,
  };

Attachment: pgpHNkja2yWs4.pgp
Description: OpenPGP digital signature