Hi all, Today's linux-next merge of the iio tree got a conflict in: drivers/iio/imu/inv_icm42607/inv_icm42607_core.c between commit: 4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family") from the origin tree and commit: c99b3501a5944 ("iio: imu: inv_icm42607: Implement MREGx register access") from the iio 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/iio/imu/inv_icm42607/inv_icm42607_core.c index 2c0a15d6344a6,f73730493e529..0000000000000 --- a/drivers/iio/imu/inv_icm42607/inv_icm42607_core.c +++ b/drivers/iio/imu/inv_icm42607/inv_icm42607_core.c @@@ -578,9 -861,16 +861,16 @@@ int inv_icm42607_core_probe(struct regm { struct device *dev = regmap_get_device(regmap); struct inv_icm42607_state *st; + struct regmap *regmap_custom; int ret; + regmap_custom = devm_regmap_init(dev, &inv_icm42607_regmap_bus, regmap, + &inv_icm42607_virt_regmap_config); + if (IS_ERR(regmap_custom)) + return dev_err_probe(dev, PTR_ERR(regmap_custom), + "Failed to register regmap\n"); + - st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL); + st = devm_kzalloc_obj(dev, *st); if (!st) return -ENOMEM;