Merge branch 'for-4.7/dsm' into libnvdimm-for-next