From: Andrew Morton <akpm@linux-foundation.org>
To: Sasha Levin <sashal@kernel.org>
Cc: Mark Brown <broonie@kernel.org>,
Muchun Song <muchun.song@linux.dev>,
Paul Walmsley <pjw@kernel.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Alexandre Ghiti <alex@ghiti.fr>,
David Hildenbrand <david@kernel.org>,
Jisheng Zhang <jszhang@kernel.org>,
Mike Rapoport <rppt@kernel.org>,
Vlastimil Babka <vbabka@kernel.org>,
linux-riscv@lists.infradead.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
Subject: Re: [PATCH linux-next] riscv/mm: fix up the mm-fixes merge of free_pmd_table()
Date: Fri, 30 Oct 2026 15:33:47 -0700 [thread overview]
Message-ID: <20261030153347.5641a97e22e18ddff6043416@linux-foundation.org> (raw)
In-Reply-To: <20261030221401.155797-1-sashal@kernel.org>
On Fri, 30 Oct 2026 18:14:01 -0400 Sasha Levin <sashal@kernel.org> wrote:
> The mm-fixes merge reuses an older resolution of the conflict in
> remove_pud_mapping() and keeps the free_pmd_table() call that passes
> is_vmemmap. Commit f998a21c2ba5 ("riscv/mm: fix hotplug page-table
> destructor handling") in mm-fixes removed that argument, so a riscv
> build with CONFIG_MEMORY_HOTPLUG fails:
>
> arch/riscv/mm/init.c:1657:35: error: too many arguments to function call, expected 2, have 3
>
> Drop the argument to match the mm-fixes version of the call.
>
> ---
> Mark, this applies on top of next-20261030 and is meant to be folded into
> the mm-fixes merge resolution. Next/merge.log says it was resolved using
> a previous resolution, I think the one from the risc-v/mm conflict on
> 2026-10-12, which had the same problem (next-20261012 has it too).
Thanks. The "mm: Fix page-table teardown during memory hot-remove", v3
series was problematic, but I now have all four patches lined up in
Muchun's as-sent order in mm-hotfixes-unstable. I'll push that in the
next hour or three. Then hopefully any -next merge resolution can just
go away.
prev parent reply other threads:[~2026-10-30 22:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-12 15:59 linux-next: manual merge of the risc-v tree with the mm tree Mark Brown
2026-10-13 2:01 ` Andrew Morton
2026-10-13 2:29 ` Muchun Song
2026-10-30 22:14 ` [PATCH linux-next] riscv/mm: fix up the mm-fixes merge of free_pmd_table() Sasha Levin
2026-10-30 22:33 ` 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=20261030153347.5641a97e22e18ddff6043416@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=alex@ghiti.fr \
--cc=broonie@kernel.org \
--cc=david@kernel.org \
--cc=jszhang@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=muchun.song@linux.dev \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
--cc=rppt@kernel.org \
--cc=sashal@kernel.org \
--cc=vbabka@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