Messages in this thread | | | Date | Tue, 29 Jan 2019 15:12:09 +0100 | From | Boris Brezillon <> | Subject | Re: linux-next: manual merge of the mtd tree with Linus' tree |
| |
On Tue, 29 Jan 2019 11:17:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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: > > 2c24c9af0f38 ("mtd: rework partitions handling")
I dropped this patch for now. I'll merge -rc2 before applying them next time.
Thanks for the report.
Boris
| |