Subject: Re: linux-next: manual merge of the bpf-next tree with the mm-stable tree

From: Uladzislau Rezki <[email-masked]>
Date: Fri, 15 Mar 2024 08:29:49 +0100

> > > > This is now a conflict between the net-next tree and the mm-stable tree.
> > >
> > >  ... and now a conflict between te mm-stable tree and Linus' tree.
> > >
> > If you need some help with resolving conflicts i can help. The problem
> > to me looks like:
> >
> > <snip>
> > commit d7bca9199a27b8690ae1c71dc11f825154af7234
> > Author: Alexei Starovoitov <[email-masked]>
> > Date:   Fri Mar 8 09:12:54 2024 -0800
> >
> >     mm: Introduce vmap_page_range() to map pages in PCI address space
> >
> > commit e6f798225a31485e47a6e4f6aa07ee9fdf80c2cb
> > Author: Alexei Starovoitov <[email-masked]>
> > Date:   Mon Mar 4 19:05:16 2024 -0800
> >
> >     mm: Introduce VM_SPARSE kind and vm_area_[un]map_pages().
> >
> > commit 3e49a866c9dcbd8173e4f3e491293619a9e81fa4
> > Author: Alexei Starovoitov <[email-masked]>
> > Date:   Mon Mar 4 19:05:15 2024 -0800
> >
> >     mm: Enforce VM_IOREMAP flag and range in ioremap_page_range.
> > <snip>
> >
> > those three patches were not based on linux-next and are currently
> > in the Linus tree(bypassing mm-tree?). Whereas below work:
> >
> > mm: vmalloc: refactor vmalloc_dump_obj() function
> > mm: vmalloc: improve description of vmap node layer
> > mm: vmalloc: add a shrinker to drain vmap pools
> > mm: vmalloc: set nr_nodes based on CPUs in a system
> > mm: vmalloc: support multiple nodes in vmallocinfo
> > mm: vmalloc: support multiple nodes in vread_iter
> > mm: vmalloc: add a scan area of VA only once
> > mm: vmalloc: offload free_vmap_area_lock lock
> > mm: vmalloc: remove global purge_vmap_area_root rb-tree
> > mm/vmalloc: remove vmap_area_list
> > mm: vmalloc: remove global vmap_area_root rb-tree
> > mm: vmalloc: move vmap_init_free_space() down in vmalloc.c
> > mm: vmalloc: rename adjust_va_to_fit_type() function
> > mm: vmalloc: add va_alloc() helper
> >
> > now should be based on Alexei Starovoitov base in order to resolve
> > a small conflict.
> 
> Pls don't rebase anything.
> 
> > But you better know how to proceed. Just in case, if you need some
> > support please let me know i can help with conflict resolving.
> 
> As Stephen said these two conflict:
> 
> > > >   8e1d743f2c26 ("mm: vmalloc: support multiple nodes in vmallocinfo")
> > > >
> > > >   e6f798225a31 ("mm: Introduce VM_SPARSE kind and vm_area_[un]map_pages().")
> 
> and conflict is trivial. It just looks big due to the indent change.
>
It is solved in the Linus's tree what is good. 

--
Uladzislau Rezki