From: Muchun Song <muchun.song@linux•dev>
To: Mark Brown <broonie@kernel•org>
Cc: Huacai Chen <chenhuacai@loongson•cn>,
Andrew Morton <akpm@linux-foundation•org>,
Huacai Chen <chenhuacai@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Muchun Song <songmuchun@bytedance•com>
Subject: Re: linux-next: manual merge of the loongarch tree with the mm-unstable tree
Date: Fri, 22 May 2026 20:20:01 +0800 [thread overview]
Message-ID: <512D3F9B-2C2C-404E-A777-2C9245876F8C@linux.dev> (raw)
In-Reply-To: <ahBDDF2noinoSIg5@sirena.org.uk>
> On May 22, 2026, at 19:50, Mark Brown <broonie@kernel•org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the loongarch tree got a conflict in:
>
> arch/loongarch/mm/init.c
>
> between commit:
>
> c0defeccc630f ("mm/sparse-vmemmap: pass @pgmap argument to memory deactivation paths")
>
> from the mm-unstable tree and commit:
>
> 0ccc9d47cf020 ("LoongArch: Remove unused code to avoid build warning")
>
> from the loongarch 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.
>
> diff --cc arch/loongarch/mm/init.c
> index 055ecd2c8fd94,031b39eb081c5..0000000000000
> --- a/arch/loongarch/mm/init.c
> +++ b/arch/loongarch/mm/init.c
> @@@ -124,12 -123,8 +124,8 @@@ void arch_remove_memory(u64 start, u64
> {
> unsigned long start_pfn = start >> PAGE_SHIFT;
> unsigned long nr_pages = size >> PAGE_SHIFT;
> - struct page *page = pfn_to_page(start_pfn);
>
> - /* With altmap the first mapped page is offset from @start */
> - if (altmap)
> - page += vmem_altmap_offset(altmap);
> - __remove_pages(start_pfn, nr_pages, altmap);
> + __remove_pages(start_pfn, nr_pages, altmap, pgmap);
> }
> #endif
I think your fix is right.
Thanks,
Muchun
prev parent reply other threads:[~2026-05-22 12:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-22 11:50 linux-next: manual merge of the loongarch tree with the mm-unstable tree Mark Brown
2026-05-22 12:20 ` Muchun Song [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=512D3F9B-2C2C-404E-A777-2C9245876F8C@linux.dev \
--to=muchun.song@linux$(echo .)dev \
--cc=akpm@linux-foundation$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chenhuacai@loongson$(echo .)cn \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=songmuchun@bytedance$(echo .)com \
/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