From: Paul Walmsley <pjw@kernel•org>
To: Andrew Morton <akpm@linux-foundation•org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Palmer Dabbelt <palmer@dabbelt•com>,
david@redhat•com, Paul Walmsley <paul@pwsan•com>,
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: Re: linux-next: manual merge of the risc-v tree with the mm-unstable tree
Date: Tue, 25 Nov 2025 02:12:26 -0700 (MST) [thread overview]
Message-ID: <deb9f5c1-87fd-9a1f-6277-93d63829bcf5@kernel.org> (raw)
In-Reply-To: <20251124120543.7dee3c33@canb.auug.org.au>
Hi Andrew,
On Mon, 24 Nov 2025, Stephen Rothwell wrote:
> 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.
[ ... ]
> 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
I think it might be easier for us, and would result in fewer merge
conflicts, if we took this series through the RISC-V tree. We're merging
in quite a few changes to this hwcap.h file, and touching it in -mm is
likely to result in some unnecessary merge conflicts when we send it to
Linus.
If you'd still prefer to take it via -mm, we could also establish a shared
base.
What do you think?
- Paul
next prev parent reply other threads:[~2025-11-25 9:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-24 1:05 linux-next: manual merge of the risc-v tree with the mm-unstable tree Stephen Rothwell
2025-11-25 9:12 ` Paul Walmsley [this message]
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=deb9f5c1-87fd-9a1f-6277-93d63829bcf5@kernel.org \
--to=pjw@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=david@redhat$(echo .)com \
--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=sfr@canb$(echo .)auug.org.au \
--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