diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-06-30 14:04:08 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-06-30 14:04:08 -0600 |
| commit | 6e34e784e72132c91b03d4f2f85bd4725b1ad9e5 (patch) | |
| tree | 322d69c0d212c62d88a5c817ef8968a9c1cfe81f /drivers/nvme/host/constants.c | |
| parent | a587b046ce921cc1805de6f0f000209b3644cadd (diff) | |
| parent | 4e69d4dabd2379af57b0b8fb9b0d62c23f9cd3b8 (diff) | |
Merge tag 'nvme-6.5-2023-06-30' of git://git.infradead.org/nvme into block-6.5
Pull NVMe fixes from Keith:
"nvme fixes for Linux 6.5
- Reduce spamming kernel logs on repeated controller updates (Breno)
- Improved struct packing (Christophe JAILLET)
- Misspelled command name in error logging (Damien)
- Failover fix for temporary frozen queue (Sagi)
- Reset error handling fixes (Keith)"
* tag 'nvme-6.5-2023-06-30' of git://git.infradead.org/nvme:
nvme: disable controller on reset state failure
nvme: sync timeout work on failed reset
nvme: ensure unquiesce on teardown
nvme-mpath: fix I/O failure with EAGAIN when failing over I/O
nvme: host: fix command name spelling
nvmet: Reorder fields in 'struct nvmet_ns'
nvme: Print capabilities changes just once
Diffstat (limited to 'drivers/nvme/host/constants.c')
| -rw-r--r-- | drivers/nvme/host/constants.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/constants.c b/drivers/nvme/host/constants.c index 5e4f8848dce0..20f46c230885 100644 --- a/drivers/nvme/host/constants.c +++ b/drivers/nvme/host/constants.c @@ -12,7 +12,7 @@ static const char * const nvme_ops[] = { [nvme_cmd_read] = "Read", [nvme_cmd_write_uncor] = "Write Uncorrectable", [nvme_cmd_compare] = "Compare", - [nvme_cmd_write_zeroes] = "Write Zeros", + [nvme_cmd_write_zeroes] = "Write Zeroes", [nvme_cmd_dsm] = "Dataset Management", [nvme_cmd_verify] = "Verify", [nvme_cmd_resv_register] = "Reservation Register", |