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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20190129151209.16bf37f4@bbrezillon>
Date:   Tue, 29 Jan 2019 15:12:09 +0100
From:   Boris Brezillon <bbrezillon@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Brian Norris <computersforpeace@...il.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Miquel Raynal <miquel.raynal@...tlin.com>
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@...b.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