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

From: Linus Torvalds

Date: Thu Nov 19 2026 - 13:20:12 EST


On Tue, 17 Nov 2026 at 06:50, Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Today's linux-next merge of the mm-fixes tree got a conflict in:
>
> lib/assoc_array.c
>
> between commits:
>
> 2dafc9bc491da ("assoc_array: find and collapse in deletion without gotos")
> 4a5db94ad9b76 ("assoc_array: move deletion's collapse into a function of its own")
>
> from the origin tree and commit:
>
> 37ff457ec4679 ("assoc_array: discard shortcut when collapsing a leaf-only node")
>
> from the mm-fixes tree. My fix below just drops Daeheyon's patch which
> I don't think is the correct resolution

It does end up being the correct resolution - 37ff457ec4679 is fixing
the same issue that commit 48691075b0ad ("assoc_array: don't chain a
new shortcut onto an existing one") did.

And the conflict looks bad just because the whole re-org to make that
code readable (with a couple of other less important fixes).

I htink Andrew already removed the patch from his queue.

Linus