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

\
 
 \ /
  Last update: 2022-03-15 09:22    [W:0.068 / U:0.312 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site