From: Andrew Morton <akpm@linux-foundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>, Deepak Gupta <debug@rivosinc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lorenzo Stoakes <lorenzo.stoakes@oracle•com>,
Paul Walmsley <pjw@kernel•org>
Subject: Re: linux-next: manual merge of the risc-v tree with the mm-unstable tree
Date: Fri, 28 Nov 2025 10:24:33 -0800 [thread overview]
Message-ID: <20251128102433.9078be7e10ef9d97171e5b50@linux-foundation.org> (raw)
In-Reply-To: <20251128102707.15b3f283@canb.auug.org.au>
On Fri, 28 Nov 2025 10:27:07 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the risc-v tree got a conflict in:
>
> include/linux/mm.h
>
> between commit:
>
> 554156bd610e ("mm: declare VMA flags by bit")
>
> from the mm-unstable tree and commit:
>
> ae8460ac9db2 ("mm: add VM_SHADOW_STACK definition for riscv")
>
> 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.
Thanks. Looks like a huge mess, but in fact it's just this change,
from the riscv tree:
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -380,6 +380,13 @@ extern unsigned int kobjsize(const void *objp);
# define VM_SHADOW_STACK VM_HIGH_ARCH_6
#endif
+#if defined(CONFIG_RISCV_USER_CFI)
+/*
+ * Following x86 and picking up the same bitpos.
+ */
+# define VM_SHADOW_STACK VM_HIGH_ARCH_5
+#endif
+
#ifndef VM_SHADOW_STACK
# define VM_SHADOW_STACK VM_NONE
#endif
which should be simple for Linus to resolve.
next prev parent reply other threads:[~2025-11-28 18:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-27 23:27 linux-next: manual merge of the risc-v tree with the mm-unstable tree Stephen Rothwell
2025-11-28 18:24 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-24 1:05 Stephen Rothwell
2025-11-25 9:12 ` Paul Walmsley
2025-11-25 17:40 ` 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=20251128102433.9078be7e10ef9d97171e5b50@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=debug@rivosinc$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lorenzo.stoakes@oracle$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=pjw@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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