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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20231109102335.79b6bf50@canb.auug.org.au>
Date:   Thu, 9 Nov 2023 10:23:35 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Huacai Chen <chenhuacai@...ngson.cn>
Cc:     Hengqi Chen <hengqi.chen@...il.com>,
        Huacai Chen <chenhuacai@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tianrui Zhao <zhaotianrui@...ngson.cn>
Subject: linux-next: manual merge of the loongarch tree with Linus' tree

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 {

Content of type "application/pgp-signature" skipped