linux-kernel - Re: linux-next: manual merge of the nvdimm tree with the block 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]

Message-ID: <20220315082139.GA3447@lst.de>
Date:   Tue, 15 Mar 2022 09:21:39 +0100
From:   Christoph Hellwig <hch@....de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Dan Williams <dan.j.williams@...el.com>,
        Jens Axboe <axboe@...nel.dk>, Christoph Hellwig <hch@....de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the nvdimm tree with the block tree

On Tue, Mar 15, 2022 at 07:18:31PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the nvdimm tree got a conflict in:
> 
>   drivers/nvdimm/blk.c
> 
> between commits:
> 
>   322cbb50de71 ("block: remove genhd.h")
>   20072ec82864 ("nvdimm-blk: use bvec_kmap_local in nd_blk_rw_integrity")
> 
> from the block tree and commit:
> 
>   f8669f1d6a86 ("nvdimm/blk: Delete the block-aperture window driver")
> 
> from the nvdimm tree.

Yeah, the conflict resolution looks obviously correct :)

Thanks!