Re: linux-next: manual merge of the liveupdate tree with the mm tree

[Mike Rapoport]

On Thu, Sep 24, 2026 at 06:08:56PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the liveupdate tree got a conflict in:
> 
>   mm/mm_init.c
> 
> between commit:
> 
>   a666a70d029d3 ("mm/mm_init: skip initializing shared vmemmap tail pages")
> 
> from the mm tree and commit:
> 
>   85d3615cea179 ("kho: rename KHO scratch to KHO bootmem")
> 
> from the liveupdate 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.

Looks correct to me.
Thanks!
 
> diff --combined mm/mm_init.c
> index dc835f753ea9a,24a53d5f0893d..0000000000000
> --- a/mm/mm_init.c
> +++ b/mm/mm_init.c
> @@@ -29,7 -29,6 +29,7 @@@
>   #include <linux/cma.h>
>   #include <linux/crash_dump.h>
>   #include <linux/execmem.h>
>  +#include <linux/sizes.h>
>   #include <linux/vmstat.h>
>   #include <linux/kexec_handover.h>
>   #include <linux/hugetlb.h>
> @@@ -678,33 -677,21 +678,33 @@@ static inline void fixup_hashdist(void
>   static inline void fixup_hashdist(void) {}
>   #endif /* CONFIG_NUMA */
>   
>  -#if defined(CONFIG_ZONE_DEVICE) || defined(CONFIG_DEFERRED_STRUCT_PAGE_INIT)
>   static __meminit void pageblock_migratetype_init_range(unsigned long pfn,
>  -		unsigned long nr_pages, int migratetype, bool atomic)
>  +		unsigned long nr_pages, int migratetype, bool isolate, bool atomic)
>   {
>   	const unsigned long end = pfn + nr_pages;
>   
>   	for (pfn = pageblock_align(pfn); pfn < end; pfn += pageblock_nr_pages) {
> - 		enum migratetype mt = kho_scratch_migratetype(pfn, migratetype);
> + 		enum migratetype mt = kho_bootmem_migratetype(pfn, migratetype);

-- 
Sincerely yours,
Mike.