linux-next: manual merge of the loongarch tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/loongarch/include/asm/inst.h

between commit:

  81efe043a351 ("LoongArch: KVM: Implement handle iocsr exception")

from Linus' tree and commit:

  add28024405e ("LoongArch: Add more instruction opcodes and emit_* helpers")

from the loongarch 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/loongarch/include/asm/inst.h
index 008a88ead60d,5350ae9ee380..000000000000
--- a/arch/loongarch/include/asm/inst.h
+++ b/arch/loongarch/include/asm/inst.h
@@@ -65,14 -65,8 +65,16 @@@ enum reg2_op 
  	revbd_op	= 0x0f,
  	revh2w_op	= 0x10,
  	revhd_op	= 0x11,
+ 	extwh_op	= 0x16,
+ 	extwb_op	= 0x17,
 +	iocsrrdb_op     = 0x19200,
 +	iocsrrdh_op     = 0x19201,
 +	iocsrrdw_op     = 0x19202,
 +	iocsrrdd_op     = 0x19203,
 +	iocsrwrb_op     = 0x19204,
 +	iocsrwrh_op     = 0x19205,
 +	iocsrwrw_op     = 0x19206,
 +	iocsrwrd_op     = 0x19207,
  };
  
  enum reg2i5_op {

Attachment: pgpSucyioknoJ.pgp
Description: OpenPGP digital signature