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

On Thu, Sep 19, 2019 at 8:02 AM Mark Brown wrote: > > Hi all, > > Today's linux-next merge of the nvdimm tree got a conflict in: > > drivers/nvdimm/pfn_devs.c > > between commit: > > 274b924088e935 ("libnvdimm/pfn: Fix namespace creation on misaligned > addresses") > > from the

linux-next: manual merge of the nvdimm tree with the libnvdimm-fixes tree

Hi all, Today's linux-next merge of the nvdimm tree got a conflict in: drivers/nvdimm/pfn_devs.c between commit: 274b924088e935 ("libnvdimm/pfn: Fix namespace creation on misaligned addresses") from the libnvdimm-fixes tree and commit: edbb52c24441ab ("libnvdimm/pfn_dev: Add page size