Re: linux-next: manual merge of the drivers-memory-fixes tree with the origin tree
From: Geert Uytterhoeven
Date: Tue Nov 17 2026 - 04:20:42 EST
Hi Mark,
On Mon, 9 Nov 2026 at 13:48, Mark Brown <broonie@xxxxxxxxxx> wrote:
> Today's linux-next merge of the drivers-memory-fixes tree got a
> conflict in:
>
> drivers/memory/fsl_ifc.c
>
> between commit:
>
> 4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
>
> from the origin tree and commit:
>
> a78ee2e05f7c7 ("memory: fsl_ifc: Clear fsl_ifc_ctrl_dev on probe failure and removal")
>
> from the drivers-memory-fixes 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 for your resolution!
> --- a/drivers/memory/fsl_ifc.c
> +++ b/drivers/memory/fsl_ifc.c
> @@@ -207,15 -210,15 +210,15 @@@ static int fsl_ifc_ctrl_probe(struct pl
>
> dev_info(&dev->dev, "Freescale Integrated Flash Controller\n");
>
> - fsl_ifc_ctrl_dev = devm_kzalloc_obj(&dev->dev, *fsl_ifc_ctrl_dev);
> - if (!fsl_ifc_ctrl_dev)
> - ctrl = devm_kzalloc(&dev->dev, sizeof(*ctrl), GFP_KERNEL);
> ++ ctrl = devm_kzalloc_obj(&dev->dev, *fsl_ifc_ctrl_dev);
"*fsl_ifc_ctrl_dev" should be replaced by "*ctrl".
> + if (!ctrl)
> return -ENOMEM;
>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds