Skip to contentSkip to conversation

linux-next: manual merge of the slab tree with the mm-unstable tree

DISCUSSION Stephen Rothwell 3 participants 3 messages Sep 4, 2025 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.

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

tools/testing/vma/vma_internal.h

between commit:

da018ebb7157 ("tools/testing/vma: clean up stubs in vma_internal.h")

from the mm-unstable tree and commits:

cbb6a30df135 ("tools/testing/vma: Implement vm_refcnt reset") 6602bcbdfbad ("tools/testing: Add support for changes to slab for sheaves")

from the slab tree.

I fixed it up (I used the latter version) 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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 5 lines · Stephen Rothwell

Hi all,

FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.

Quoted 7 lines

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

tools/testing/vma/vma_internal.h

between commit:

da018ebb7157 ("tools/testing/vma: clean up stubs in vma_internal.h")

We can solve it by me taking this and

65d011b2bc05 ("maple_tree: remove redundant __GFP_NOWARN")

from the other thread and Andrew dropping them in mm-unstable. I tried to rebase mm-unstable locally while dropping those and there were no conflicts and they are self-contained cleanups. AFAIR Andrew was fine with such resolutions in the past.

Thanks.

Quoted 14 lines

from the mm-unstable tree and commits:

cbb6a30df135 ("tools/testing/vma: Implement vm_refcnt reset") 6602bcbdfbad ("tools/testing: Add support for changes to slab for sheaves")

from the slab tree.

I fixed it up (I used the latter version) 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.

#2 lore raw
Quoted 14 lines · On Thu, 4 Sep 2025 10:39:47 +0200 Vlastimil Babka <[email protected]> wrote:
Quoted 5 lines · Stephen Rothwell

Hi all,

FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.

Quoted 7 lines

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

tools/testing/vma/vma_internal.h

between commit:

da018ebb7157 ("tools/testing/vma: clean up stubs in vma_internal.h")

Quoted 8 lines

We can solve it by me taking this and

65d011b2bc05 ("maple_tree: remove redundant __GFP_NOWARN")

from the other thread and Andrew dropping them in mm-unstable. I tried to rebase mm-unstable locally while dropping those and there were no conflicts and they are self-contained cleanups. AFAIR Andrew was fine with such resolutions in the past.

Yep, I generally just drop things when these conflicts occur.