Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'