diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-07-22 13:48:10 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-07-22 13:48:10 +0300 |
| commit | b8da74000db3979a7ea1138125ba4b4cf105b608 (patch) | |
| tree | dfd208f4ad1ece05e4c4b0afafceab3f55df8880 /include/linux | |
| parent | 675f940576351bb049f5677615140b9d0a7712d0 (diff) | |
| parent | 5b2c214a95942f7997d1916a4c44017becbc3cac (diff) | |
| download | linux-b8da74000db3979a7ea1138125ba4b4cf105b608.tar.xz | |
Merge tag 'nvme-6.17-2025-07-22' of git://git.infradead.org/nvme into for-6.17/block
Pull NVMe updates from Christoph:
"- try PCIe function level reset on init failure (Keith Busch)
- log TLS handshake failures at error level (Maurizio Lombardi)
- pci-epf: do not complete commands twice if nvmet_req_init() fails
(Rick Wertenbroek)
- misc cleanups (Alok Tiwari)"
* tag 'nvme-6.17-2025-07-22' of git://git.infradead.org/nvme:
nvme-pci: try function level reset on init failure
nvmet: pci-epf: Do not complete commands twice if nvmet_req_init() fails
nvme-tcp: log TLS handshake failures at error level
docs: nvme: fix grammar in nvme-pci-endpoint-target.rst
nvme: fix typo in status code constant for self-test in progress
nvmet: remove redundant assignment of error code in nvmet_ns_enable()
nvme: fix incorrect variable in io cqes error message
nvme: fix multiple spelling and grammar issues in host drivers
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvme.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index b65a1b9f2116..655d194f8e72 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -2155,7 +2155,7 @@ enum { NVME_SC_NS_NOT_ATTACHED = 0x11a, NVME_SC_THIN_PROV_NOT_SUPP = 0x11b, NVME_SC_CTRL_LIST_INVALID = 0x11c, - NVME_SC_SELT_TEST_IN_PROGRESS = 0x11d, + NVME_SC_SELF_TEST_IN_PROGRESS = 0x11d, NVME_SC_BP_WRITE_PROHIBITED = 0x11e, NVME_SC_CTRL_ID_INVALID = 0x11f, NVME_SC_SEC_CTRL_STATE_INVALID = 0x120, |