diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-04-26 10:25:19 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-04-26 10:25:19 -0600 |
| commit | 41d7f2ed8457d38951bc73f9e6296d8340c221e2 (patch) | |
| tree | d671f1da5e2ef377bf52d6e2acfb51aa6adb6158 /include | |
| parent | cc6be13159316e8bdcd8bbb5209315256e151337 (diff) | |
| parent | 01fa017484ad98fccdeaab32db0077c574b6bd6f (diff) | |
Merge branch 'nvme-5.2' of git://git.infradead.org/nvme into for-5.2/block
Pull NVMe changes from Christoph.
* 'nvme-5.2' of git://git.infradead.org/nvme:
nvme: set 0 capacity if namespace block size exceeds PAGE_SIZE
nvme-rdma: fix typo in struct comment
nvme-loop: kill timeout handler
nvme-tcp: rename function to have nvme_tcp prefix
nvme-rdma: fix a NULL deref when an admin connect times out
nvme-tcp: fix a NULL deref when an admin connect times out
nvmet-tcp: don't fail maxr2t greater than 1
nvmet-file: clamp-down file namespace lba_shift
nvmet: include <linux/scatterlist.h>
nvmet: return a specified error it subsys_alloc fails
nvmet: rename nvme_completion instances from rsp to cqe
nvmet-rdma: remove p2p_client initialization from fast-path
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvme-rdma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nvme-rdma.h b/include/linux/nvme-rdma.h index 3aa97b98dc89..3ec8e50efa16 100644 --- a/include/linux/nvme-rdma.h +++ b/include/linux/nvme-rdma.h @@ -77,7 +77,7 @@ struct nvme_rdma_cm_rep { * struct nvme_rdma_cm_rej - rdma connect reject * * @recfmt: format of the RDMA Private Data - * @fsts: error status for the associated connect request + * @sts: error status for the associated connect request */ struct nvme_rdma_cm_rej { __le16 recfmt; |