diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-11-06 01:34:10 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-11-06 01:34:10 +0300 |
| commit | 0473976c3568cbe7ef4b4af5c134960cb7bb2779 (patch) | |
| tree | 7bde402c5afaf6de7dbc78c9672f379f75ff950a /include/uapi/linux | |
| parent | 41591a51f00d2dc7bb9dc6e9bedf56c5cf6f2392 (diff) | |
| parent | 0d6eeb1fd625272bd60d25f2d5e116cf582fc7dc (diff) | |
| download | linux-0473976c3568cbe7ef4b4af5c134960cb7bb2779.tar.xz | |
Merge branch 'nvme-5.4-rc7' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Keith:
"We have a few late nvme fixes for a couple device removal kernel
crashes, and a compat fix for a new ioctl introduced during this merge
window."
* 'nvme-5.4-rc7' of git://git.infradead.org/nvme:
nvme: change nvme_passthru_cmd64 to explicitly mark rsvd
nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths
nvme-rdma: fix a segmentation fault during module unload
Diffstat (limited to 'include/uapi/linux')
| -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; }; |