From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Paul Walmsley <pjw@kernel.org>,
Vivian Wang <wangruikang@iscas.ac.cn>
Subject: Re: linux-next: manual merge of the mm-nonmm-unstable tree with the risc-v-fixes tree
Date: Tue, 14 Jul 2026 10:13:43 -0700 [thread overview]
Message-ID: <20260714101343.5319eda0435560ad84828a7a@linux-foundation.org> (raw)
In-Reply-To: <alYh7S9n9qE8-Hc_@sirena.org.uk>
On Tue, 14 Jul 2026 12:47:57 +0100 Mark Brown <broonie@kernel.org> wrote:
> Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:
>
> mm/sparse-vmemmap.c
>
> between commit:
>
> 4edd70ee6a7d0 ("mm/sparse-vmemmap: flush_cache_vmap() after hotplugging vmemmap")
>
> from the risc-v-fixes tree and commit:
>
> 7605044cea4d2 ("riscv: mm: avoid spurious fault after hotplugging vmemmap")
>
> from the mm-nonmm-unstable tree. These appear to be two versions of the
> same fix, it looks like one needs to be chosen - I did the conflict
> resolution picking based on taste but left the non-conflicting bits of
> both changes.
OK, thanks. I'll remove "riscv: mm: avoid spurious fault after
hotplugging vmemmap" from mm.git.
prev parent reply other threads:[~2026-07-14 17:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-14 11:47 linux-next: manual merge of the mm-nonmm-unstable tree with the risc-v-fixes tree Mark Brown
2026-07-14 17:13 ` 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=20260714101343.5319eda0435560ad84828a7a@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pjw@kernel.org \
--cc=wangruikang@iscas.ac.cn \
/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