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

From: Mark Brown

Date: Mon Nov 16 2026 - 14:25:41 EST


Hi all,

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

drivers/mfd/loongson-se.c

between commit:

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

from the origin tree and commit:

5310684a8d3aa ("mfd: loongson-se: Zero-allocate driver data and initialise engine completions in probe")

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/loongson-se.c
index b87098010c175,23af05d388aa1..0000000000000
--- a/drivers/mfd/loongson-se.c
+++ b/drivers/mfd/loongson-se.c
@@@ -190,7 -236,7 +236,7 @@@ static int loongson_se_probe(struct pla
int nr_irq, irq, err, i;
dma_addr_t paddr;

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

Attachment: signature.asc
Description: PGP signature