Re: linux-next: manual merge of the kbuild tree with the mm-nonmm-unstable tree

[Lorenzo Stoakes (ARM)]

On Wed, Sep 30, 2026 at 12:47:13PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the kbuild tree got a conflict in:
>
>   scripts/kallsyms.c
>
> between commit:
>
>   edd7005a42d42 ("kallsyms: increase marker density to 16:1 to accelerate lookups")
>
> from the mm-nonmm-unstable tree and commit:
>
>   531980b4b17e9 ("kallsyms: reimplement mksysmap in C")
>
> from the kbuild 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.

Looks correct to me, thanks!

--
Cheers, Lorenzo