From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Chunyan Zhang <zhangchunyan@iscas•ac.cn>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Paul Walmsley <pjw@kernel•org>, Xu Lu <luxu.kernel@bytedance•com>
Subject: linux-next: manual merge of the risc-v tree with the mm-unstable tree
Date: Mon, 24 Nov 2025 12:05:43 +1100 [thread overview]
Message-ID: <20251124120543.7dee3c33@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/include/asm/hwcap.h
between commit:
a2fb99195ca8 ("riscv: add RISC-V Svrsw60t59b extension support")
from the mm-unstable tree and commit:
0597b9c8627e ("riscv: Add ISA extension parsing for Zalasr")
from the risc-v 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/hwcap.h
index f98fcb5c17d5,ae3852c4f2ca..000000000000
--- a/arch/riscv/include/asm/hwcap.h
+++ b/arch/riscv/include/asm/hwcap.h
@@@ -106,7 -106,7 +106,8 @@@
#define RISCV_ISA_EXT_ZAAMO 97
#define RISCV_ISA_EXT_ZALRSC 98
#define RISCV_ISA_EXT_ZICBOP 99
-#define RISCV_ISA_EXT_ZALASR 100
+#define RISCV_ISA_EXT_SVRSW60T59B 100
++#define RISCV_ISA_EXT_ZALASR 101
#define RISCV_ISA_EXT_XLINUXENVCFG 127
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-24 1:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-24 1:05 Stephen Rothwell [this message]
2025-11-25 9:12 ` linux-next: manual merge of the risc-v tree with the mm-unstable tree Paul Walmsley
2025-11-25 17:40 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2025-11-27 23:27 Stephen Rothwell
2025-11-28 18:24 ` Andrew Morton
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=20251124120543.7dee3c33@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luxu.kernel@bytedance$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=pjw@kernel$(echo .)org \
--cc=zhangchunyan@iscas$(echo .)ac.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