* linux-next: manual merge of the drivers-memory-fixes tree with the origin tree
@ 2026-11-09 12:32 Mark Brown
2026-11-17 9:20 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2026-11-09 12:32 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Kees Cook, Kees Cook, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]
Hi all,
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.
diff --cc drivers/memory/fsl_ifc.c
index db2d239aeba89,83991c05a6a5c..0000000000000
--- 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);
+ if (!ctrl)
return -ENOMEM;
- dev_set_drvdata(&dev->dev, fsl_ifc_ctrl_dev);
+ dev_set_drvdata(&dev->dev, ctrl);
/* IOMAP the entire IFC region */
- fsl_ifc_ctrl_dev->gregs = of_iomap(dev->dev.of_node, 0);
- if (!fsl_ifc_ctrl_dev->gregs) {
+ ctrl->gregs = of_iomap(dev->dev.of_node, 0);
+ if (!ctrl->gregs) {
dev_err(&dev->dev, "failed to get memory region\n");
return -ENODEV;
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the drivers-memory-fixes tree with the origin tree
2026-11-09 12:32 linux-next: manual merge of the drivers-memory-fixes tree with the origin tree Mark Brown
@ 2026-11-17 9:20 ` Geert Uytterhoeven
2026-11-17 9:25 ` Krzysztof Kozlowski
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2026-11-17 9:20 UTC (permalink / raw)
To: Mark Brown
Cc: Krzysztof Kozlowski, Kees Cook, Kees Cook, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List
Hi Mark,
On Mon, 9 Nov 2026 at 13:48, Mark Brown <broonie@kernel.org> 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@linux-m68k.org
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the drivers-memory-fixes tree with the origin tree
2026-11-17 9:20 ` Geert Uytterhoeven
@ 2026-11-17 9:25 ` Krzysztof Kozlowski
0 siblings, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2026-11-17 9:25 UTC (permalink / raw)
To: Geert Uytterhoeven, Mark Brown
Cc: Kees Cook, Kees Cook, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List
On 17/11/2026 10:20, Geert Uytterhoeven wrote:
> Hi Mark,
...
> 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".
Yes, that's preferable and also it is the resolution I sent to soc@
https://lore.kernel.org/soc/de187a23-ab35-4a18-824b-88879f9563ba@kernel.org/T/#m1710794b59ead7fff9293f2c6584af64d0b830dd
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-17 9:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-09 12:32 linux-next: manual merge of the drivers-memory-fixes tree with the origin tree Mark Brown
2026-11-17 9:20 ` Geert Uytterhoeven
2026-11-17 9:25 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox