lkml.org 
[lkml]   [2019]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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

\
 
 \ /
  Last update: 2019-01-29 15:12    [W:0.043 / U:8.256 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site