* linux-next: manual merge of the loongarch tree with the mm-unstable tree
@ 2026-05-22 11:50 Mark Brown
2026-05-22 12:20 ` Muchun Song
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2026-05-22 11:50 UTC (permalink / raw)
To: Huacai Chen
Cc: Andrew Morton, Huacai Chen, Linux Kernel Mailing List,
Linux Next Mailing List, Muchun Song, Muchun Song
[-- Attachment #1: Type: text/plain, Size: 1368 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the loongarch tree with the mm-unstable tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Muchun Song @ 2026-05-22 12:20 UTC (permalink / raw)
To: Mark Brown
Cc: Huacai Chen, Andrew Morton, Huacai Chen,
Linux Kernel Mailing List, Linux Next Mailing List, Muchun Song
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-22 12:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox