Merge branch 'for-4.16/nfit' into libnvdimm-for-next