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

2016-07-24 08:05:44 -07:00
parent a72255983f d4c5725d57
commit 0606263f24
59 changed files with 1369 additions and 1009 deletions
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -298,6 +298,7 @@ struct nd_cmd_pkg {
 #define NVDIMM_FAMILY_INTEL 0
 #define NVDIMM_FAMILY_HPE1 1
 #define NVDIMM_FAMILY_HPE2 2
+#define NVDIMM_FAMILY_MSFT 3

 #define ND_IOCTL_CALL			_IOWR(ND_IOCTL, ND_CMD_CALL,\
 					struct nd_cmd_pkg)