Re: linux-next: manual merge of the nvdimm tree with the block tree

Christoph Hellwig
2022-03-15T08:21:57Z

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!