linux-next: manual merge of the mfd tree with the origin tree

From: Mark Brown

Date: Mon Nov 09 2026 - 09:23:12 EST


Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

drivers/mfd/rz-mtu3.c

between commit:

4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")

from the origin tree and commit:

9aac1f80c8784 ("mfd: rz-mtu3: Do not use struct rz_mtu3_channel::dev")

from the mfd 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/mfd/rz-mtu3.c
index 7e1313a57abc0,558ed3fbe5207..0000000000000
--- a/drivers/mfd/rz-mtu3.c
+++ b/drivers/mfd/rz-mtu3.c
@@@ -315,17 -291,16 +291,16 @@@ static int rz_mtu3_probe(struct platfor
struct rz_mtu3 *ddata;
struct reset_control *rstc;
unsigned int i;
+ int ret;

- ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);
+ ddata = devm_kzalloc_obj(dev, *ddata);
if (!ddata)
return -ENOMEM;

- ddata->priv_data = devm_kzalloc_obj(dev, *priv);
- if (!ddata->priv_data)
- priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
++ priv = devm_kzalloc_obj(dev, *priv);
+ if (!priv)
return -ENOMEM;

- priv = ddata->priv_data;
-
priv->mmio = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(priv->mmio))
return PTR_ERR(priv->mmio);

Attachment: signature.asc
Description: PGP signature