Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Fri, 3 Apr 2020 02:55:17 +0000 (19:55 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 3 Apr 2020 02:55:17 +0000 (19:55 -0700)
- Introduce 'zero_page_range' as a dax operation. This facilitates
  filesystem-dax operation without a block-device.

- Advertise a persistence-domain for of_pmem and papr_scm. The
  persistence domain indicates where cpu-store cycles need to reach in
  the platform-memory subsystem before the platform will consider them
  power-fail protected.

- Fixup some flexible-array declarations.

1  2 
arch/powerpc/platforms/pseries/papr_scm.c
drivers/acpi/nfit/nfit.h
drivers/nvdimm/nd.h

Simple merge
Simple merge