Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc drivers/acpi/nfit/core.c
index 1f0e06065ae6c5180d2e8deae426aef0966fa3dd,69b35b7f97a15383b9ccb58e2f1aff37ae767e79..8c234dd9b8bc595c21d9d5abaa7327e02b9cc572
--- 1/drivers/acpi/nfit.c
--- 2/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@@ -1150,11 -1293,12 +1293,13 @@@ static int acpi_nfit_add_dimm(struct ac
                dsm_mask = 0x1fe;
                if (disable_vendor_specific)
                        dsm_mask &= ~(1 << 8);
+       } else if (nfit_mem->family == NVDIMM_FAMILY_MSFT) {
+               dsm_mask = 0xffffffff;
        } else {
 -              dev_err(dev, "unknown dimm command family\n");
 +              dev_dbg(dev, "unknown dimm command family\n");
                nfit_mem->family = -1;
 -              return force_enable_dimms ? 0 : -ENODEV;
 +              /* DSMs are optional, continue loading the driver... */
 +              return 0;
        }
  
        uuid = to_nfit_uuid(nfit_mem->family);

diff --cc drivers/acpi/nfit/nfit.h
Simple merge

diff --cc fs/dax.c
Simple merge