From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Huacai Chen <chenhuacai@loongson•cn>
Cc: Hengqi Chen <hengqi.chen@gmail•com>,
Huacai Chen <chenhuacai@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tianrui Zhao <zhaotianrui@loongson•cn>
Subject: linux-next: manual merge of the loongarch tree with Linus' tree
Date: Thu, 9 Nov 2023 10:23:35 +1100 [thread overview]
Message-ID: <20231109102335.79b6bf50@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2023-11-08 23:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231109102335.79b6bf50@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chenhuacai@loongson$(echo .)cn \
--cc=hengqi.chen@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=zhaotianrui@loongson$(echo .)cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox