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

[Stephen Rothwell]

Hi all,

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

  arch/riscv/include/asm/sbi.h

between commit:

  b579dfe71a6a ("RISC-V: Use SBI SRST extension when available")

from the risc-v tree and commit:

  c62a76859723 ("RISC-V: KVM: Add SBI v0.2 base extension")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/include/asm/sbi.h
index 289621da4a2a,9c46dd3ff4a2..000000000000
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
@@@ -27,7 -27,14 +27,15 @@@ enum sbi_ext_id 
  	SBI_EXT_IPI = 0x735049,
  	SBI_EXT_RFENCE = 0x52464E43,
  	SBI_EXT_HSM = 0x48534D,
 +	SBI_EXT_SRST = 0x53525354,
+ 
+ 	/* Experimentals extensions must lie within this range */
+ 	SBI_EXT_EXPERIMENTAL_START = 0x08000000,
+ 	SBI_EXT_EXPERIMENTAL_END = 0x08FFFFFF,
+ 
+ 	/* Vendor extensions must lie within this range */
+ 	SBI_EXT_VENDOR_START = 0x09000000,
+ 	SBI_EXT_VENDOR_END = 0x09FFFFFF,
  };
  
  enum sbi_ext_base_fid {

Attachment: pgp_EGELlQfd9.pgp
Description: OpenPGP digital signature