[PATCH OLK-6.6 0/2] nvdimm: Backport some bugfixs