From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Alexandre Ghiti <alexghiti@rivosinc.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Paul Walmsley <pjw@kernel.org>
Subject: Re: linux-next: manual merge of the mm-stable tree with the mm-hotfixes tree
Date: Thu, 25 Sep 2025 11:26:40 -0700 [thread overview]
Message-ID: <20250925112640.573c99e5bab74dc36b18fd75@linux-foundation.org> (raw)
In-Reply-To: <aNU8moQVmqvduSPU@sirena.org.uk>
On Thu, 25 Sep 2025 13:59:06 +0100 Mark Brown <broonie@kernel.org> wrote:
> Hi all,
>
> Today's linux-next merge of the mm-stable tree got a conflict in:
>
> arch/riscv/include/asm/pgtable.h
>
> between commit:
>
> 668208b161a0b ("riscv: use an atomic xchg in pudp_huge_get_and_clear()")
>
> from the mm-hotfixes tree and commit:
This is in the mm-stable tree.
> 546e42c8c6d94 ("riscv: Use an atomic xchg in pudp_huge_get_and_clear()")
>
> from the mm-stable tree.
And this will be from a riscv tree, I assume.
> I fixed it up (see below) and can carry the fix as necessary.
Please just take the version from the riscv tree.
prev parent reply other threads:[~2025-09-25 18:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-25 12:59 linux-next: manual merge of the mm-stable tree with the mm-hotfixes tree Mark Brown
2025-09-25 18:26 ` Andrew Morton [this message]
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=20250925112640.573c99e5bab74dc36b18fd75@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=alexghiti@rivosinc.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pjw@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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