linux-next: manual merge of the drivers-memory-fixes tree with the origin tree
From: Mark Brown
Date: Mon Nov 09 2026 - 07:43:40 EST
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:
signature.asc
Description: PGP signature