Re: linux-next: manual merge of the tpmdd-keys tree with the mm-fixes,rxarray tree

From: Jarkko Sakkinen

Date: Mon Nov 16 2026 - 14:46:10 EST


On Mon, Nov 16, 2026 at 07:25:47PM +0000, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the tpmdd-keys tree got a conflict in:
>
> lib/Kconfig
>
> between commits:
>
> 37ff457ec4679 ("assoc_array: discard shortcut when collapsing a leaf-only node")
> 29f1617aa1dbd ("rust: rxarray: add rust xarray support")
>
> from the mm-fixes,rxarray tree and commit:
>
> 1dbbde3bc4b80 ("lib: Remove assoc_array")
>
> from the tpmdd-keys 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.

Thanks, I'll resolve this.

Br, Jarkko