On Wed, Mar 6, 2024 at 5:36 PM Stephen Rothwell [off-list ref] wrote:

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  mm/vmalloc.c

between commit:

  8e1d743f2c26 ("mm: vmalloc: support multiple nodes in vmallocinfo")

from the mm-stable tree and commit:

  e6f798225a31 ("mm: Introduce VM_SPARSE kind and vm_area_[un]map_pages().")

from the bpf-next tree.

I fixed it up (I think - 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.

...

 -      if (v->flags & VM_USERMAP)
 -              seq_puts(m, " user");
 +                      if (v->flags & VM_IOREMAP)
 +                              seq_puts(m, " ioremap");

 -      if (v->flags & VM_DMA_COHERENT)
 -              seq_puts(m, " dma-coherent");
++                      if (v->flags & VM_SPARSE)
++                              seq_puts(m, " sparse");
+

Indent change across the loop makes the conflict look big,
but it's actually trivial and resolution looks correct.

Thanks!