diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-05-16 08:07:57 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-05-16 08:07:57 -0600 |
| commit | 47ca23c1176a9e499d4652b33e398a7ddb0bef47 (patch) | |
| tree | 1b9d9e846749128f79474e6f1637e7551e798997 /include/linux | |
| parent | 936b33f7243fa1e54c8f4f2febd3472cc00e66fd (diff) | |
| parent | 1b1031ca63b2ce1d3b664b35b77ec94e458693e9 (diff) | |
Merge branch 'nvme-5.2' of git://git.infradead.org/nvme into for-5.2/block-post
Pull NVMe fixes from Christoph
* 'nvme-5.2' of git://git.infradead.org/nvme:
nvme: validate cntlid during controller initialisation
nvme: change locking for the per-subsystem controller list
nvme: trace all async notice events
nvme: fix typos in nvme status code values
nvme-fabrics: remove unused argument
nvme-multipath: avoid crash on invalid subsystem cntlid enumeration
nvme-fc: use separate work queue to avoid warning
nvme-rdma: remove redundant reference between ib_device and tagset
nvme-pci: mark expected switch fall-through
nvme-pci: add known admin effects to augument admin effects log page
nvme-pci: init shadow doorbell after each reset
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvme.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index c40720cb59ac..8028adacaff3 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -1246,9 +1246,9 @@ enum { NVME_SC_FW_NEEDS_SUBSYS_RESET = 0x110, NVME_SC_FW_NEEDS_RESET = 0x111, NVME_SC_FW_NEEDS_MAX_TIME = 0x112, - NVME_SC_FW_ACIVATE_PROHIBITED = 0x113, + NVME_SC_FW_ACTIVATE_PROHIBITED = 0x113, NVME_SC_OVERLAPPING_RANGE = 0x114, - NVME_SC_NS_INSUFFICENT_CAP = 0x115, + NVME_SC_NS_INSUFFICIENT_CAP = 0x115, NVME_SC_NS_ID_UNAVAILABLE = 0x116, NVME_SC_NS_ALREADY_ATTACHED = 0x118, NVME_SC_NS_IS_PRIVATE = 0x119, |