linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the nvdimm 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Thu, 16 Nov 2017 13:55:26 +0900
From:   Minchan Kim <minchan@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Dan Williams <dan.j.williams@...el.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 nvdimm tree

Hi Stephen,

On Thu, Nov 16, 2017 at 02:16:27PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   drivers/block/brd.c
> 
> between commit:
> 
>   7a862fbbdec6 ("brd: remove dax support")
> 
> from the nvdimm tree and commit:
> 
>   f8ace3501d00 ("bdi: introduce BDI_CAP_SYNCHRONOUS_IO")
> 
> from the akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This

It's good for me.
Thanks.