Re: [GIT PULL] libnvdimm for 5.4

[Dan Williams]

On Fri, Sep 20, 2019 at 4:57 PM Dan Williams <dan.j.willi...@intel.com> wrote:
>
> Hi Linus, please pull from:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
> tags/libnvdimm-for-5.4
>
> ...to receive some reworks to better support nvdimms on powerpc and an
> nvdimm security interface update.

Btw, minor conflict with your tree due to a fix that went into
v5.3-rc8. Here's my resolution:

diff --cc drivers/nvdimm/pfn_devs.c
index cb98b8fe786e,ce9ef18282dd..bb9cc5cf0873
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@@ -724,9 -751,10 +753,11 @@@ static int nd_pfn_init(struct nd_pfn *n
        memcpy(pfn_sb->uuid, nd_pfn->uuid, 16);
        memcpy(pfn_sb->parent_uuid, nd_dev_to_uuid(&ndns->dev), 16);
        pfn_sb->version_major = cpu_to_le16(1);
-       pfn_sb->version_minor = cpu_to_le16(3);
+       pfn_sb->version_minor = cpu_to_le16(4);
 +      pfn_sb->end_trunc = cpu_to_le32(end_trunc);
        pfn_sb->align = cpu_to_le32(nd_pfn->align);
+       pfn_sb->page_struct_size = cpu_to_le16(MAX_STRUCT_PAGE_SIZE);
+       pfn_sb->page_size = cpu_to_le32(PAGE_SIZE);
        checksum = nd_sb_checksum((struct nd_gen_sb *) pfn_sb);
        pfn_sb->checksum = cpu_to_le64(checksum);