From: Mark Brown <broonie@kernel.org>
To: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Kees Cook <kees@kernel.org>, Kees Cook <kees+treewide@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the drivers-memory-fixes tree with the origin tree
Date: Mon, 9 Nov 2026 12:32:15 +0000 [thread overview]
Message-ID: <avG9T_NrXRjVDgjh@sirena.co.uk> (raw)
[-- 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 --]
next reply other threads:[~2026-11-09 12:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-09 12:32 Mark Brown [this message]
2026-11-17 9:20 ` Geert Uytterhoeven
2026-11-17 9:25 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=avG9T_NrXRjVDgjh@sirena.co.uk \
--to=broonie@kernel.org \
--cc=kees+treewide@kernel.org \
--cc=kees@kernel.org \
--cc=krzk@kernel.org \
--cc=krzysztof.kozlowski@oss.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®