Re: linux-next: manual merge of the mtd tree with Linus' tree

On Tue, 29 Jan 2019 11:17:00 +1100 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mtd tree got a conflict in: > > drivers/mtd/mtdpart.c > > between commit: > > 2b6f0090a333 ("mtd: Check add_mtd_device() ret code") > > from Linus' tree and commit: > > 2c24c9af0f3

linux-next: manual merge of the mtd tree with Linus' tree

Hi all, Today's linux-next merge of the mtd tree got a conflict in: drivers/mtd/mtdpart.c between commit: 2b6f0090a333 ("mtd: Check add_mtd_device() ret code") from Linus' tree and commit: 2c24c9af0f38 ("mtd: rework partitions handling") from the mtd tree. I fixed it up (see below) an