From: Dan Williams <dan.j.williams@intel.com>
Date: Sun, 24 Jul 2016 15:05:44 +0000 (-0700)
Subject: Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next
X-Git-Tag: v4.8-rc1~114^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0606263f24f3d64960de742c55894190b5df903b;p=linux.git

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

0606263f24f3d64960de742c55894190b5df903b
diff --cc drivers/acpi/nfit/core.c
index 1f0e06065ae6,69b35b7f97a1..8c234dd9b8bc
--- a/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);