Hi all, Today's linux-next merge of the mtd tree got a conflict in: drivers/mtd/maps/lantiq-flash.c between commit: 4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family") from the origin tree and commit: fd1cc5b1dc4f2 ("mtd: maps: lantiq-flash: fix NULL pointer dereference on probe") from the mtd 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/mtd/maps/lantiq-flash.c index 519126abb9a5c,5c2ace302b50c..0000000000000 --- a/drivers/mtd/maps/lantiq-flash.c +++ b/drivers/mtd/maps/lantiq-flash.c @@@ -118,11 -118,8 +118,12 @@@ ltq_mtd_probe(struct platform_device *p platform_set_drvdata(pdev, ltq_mtd); + ltq_mtd->map->virt = devm_platform_get_and_ioremap_resource(pdev, 0, <q_mtd->res); + if (IS_ERR(ltq_mtd->map->virt)) + return PTR_ERR(ltq_mtd->map->virt); + - ltq_mtd->map = devm_kzalloc_obj(&pdev->dev, struct map_info); + ltq_mtd->map = devm_kzalloc(&pdev->dev, sizeof(struct map_info), + GFP_KERNEL); if (!ltq_mtd->map) return -ENOMEM;