summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2020-06-19 14:18:51 -0700
committerDan Williams <dan.j.williams@intel.com>2020-06-19 14:18:51 -0700
commit9df24eaef86f5d5cb38c77eaa1cfa3eec09ebfe8 (patch)
treea9ad193f02275dedf11683b787fa0864cccf746d /include/uapi
parent543094e19c82b5d171e139d09a1a3ea0a7361117 (diff)
parentd35f18b554be015b6fa89fad6447c6fce8e6ad66 (diff)
Merge branch 'for-5.8/papr_scm' into libnvdimm-for-next
Include the papr_scm health retrieval feature for v5.8-rc2. The functionality was initially posted well in advance of the merge window, but review comments and a late build-bot warning kept them out of the v5.8-rc1 libnvdimm pull request. Vaibhav notes: These patches are tied to specific features that were committed to customers in upcoming distros releases (RHEL and SLES) whose time-lines are tied to 5.8 kernel release. Being able to track the health of an nvdimm is critical for our customers that are running workloads leveraging papr-scm nvdimms. Missing the 5.8 kernel would mean missing the distro timelines and shifting forward the availability of this feature in distro kernels by at least 6 months.
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/ndctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index de5d90212409..0e09dc5cec19 100644
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -244,6 +244,7 @@ struct nd_cmd_pkg {
#define NVDIMM_FAMILY_HPE2 2
#define NVDIMM_FAMILY_MSFT 3
#define NVDIMM_FAMILY_HYPERV 4
+#define NVDIMM_FAMILY_PAPR 5
#define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\
struct nd_cmd_pkg)