diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
commit | 1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38 (patch) | |
tree | 548d3518b41341b93c88ee4ff5661e1eb42bd7f4 /include/uapi/linux/nvme_ioctl.h | |
parent | d44f821b0e13275735e8f3fe4db8703b45f05d52 (diff) | |
parent | 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c (diff) |
Merge tag 'v5.4-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/nvme_ioctl.h')
-rw-r--r-- | include/uapi/linux/nvme_ioctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/nvme_ioctl.h b/include/uapi/linux/nvme_ioctl.h index e168dc59e9a0..d99b5a772698 100644 --- a/include/uapi/linux/nvme_ioctl.h +++ b/include/uapi/linux/nvme_ioctl.h @@ -63,6 +63,7 @@ struct nvme_passthru_cmd64 { __u32 cdw14; __u32 cdw15; __u32 timeout_ms; + __u32 rsvd2; __u64 result; }; |