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

From: Miquel Raynal

Date: Wed Nov 18 2026 - 11:02:36 EST


On 18/11/2026 at 14:37:37 GMT, Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
>
> Today's linux-next merge of the mtd tree got a conflict in:
>
> drivers/mtd/maps/lantiq-flash.c
>
> between commit:
>
> 4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
>
> from the origin tree and commit:
>
> fd1cc5b1dc4f2 ("mtd: maps: lantiq-flash: fix NULL pointer dereference on probe")
>
> from the mtd tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Mmmh, I discover this mess only now. I rebased my branches on top of
-rc2 and fixed the conflict so your fix should not longer be
necessary. I hope you told Linus how painful it was for everybody to
handle such late introduction :)

Thanks for the heads up,
Miquèl