diff options
| author | Jens Axboe <axboe@kernel.dk> | 2026-10-05 08:41:38 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2026-10-05 08:41:38 -0600 |
| commit | 41cab3a71dc7be62114d91cc849424879062d324 (patch) | |
| tree | 79b76a6f2014fe73ee702343f9dd76b54c663dfb /include/linux | |
| parent | 58304e139cb3fa640da74bc02101f0926d0607e2 (diff) | |
| parent | 5755f1bd0217ffe3c5cf85467bf6b0680f398265 (diff) | |
Merge tag 'nvme-7.3-2026-10-05' of git://git.infradead.org/nvme into block-7.3
Pull NVMe fixes from Keith:
"- Fix lock ordering revalidating zoned multipath heads
- Fix swapped ZRASF zone state values for full and read only
- Fix target p2pmem cleanup when the metadata allocation fails
- Fix target status code for invalid NSIDs on reservation features
- Revert the NVME_CTRL_NEW state change, which broke the Apple driver"
* tag 'nvme-7.3-2026-10-05' of git://git.infradead.org/nvme:
Revert "nvme: do not reset controllers in NVME_CTRL_NEW state"
nvmet: use the local P2P device on metadata allocation failure
nvme-multipath: revalidate head zones after unfreezing the head queue
nvme: fix swapped ZRASF zone state values for full and read only
nvmet: return Invalid Field for invalid NSIDs feature 82h
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 91ce434a7e8d..6248711784b3 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -1266,8 +1266,8 @@ enum { NVME_ZRASF_ZONE_STATE_IMP_OPEN = 0x02, NVME_ZRASF_ZONE_STATE_EXP_OPEN = 0x03, NVME_ZRASF_ZONE_STATE_CLOSED = 0x04, - NVME_ZRASF_ZONE_STATE_READONLY = 0x05, - NVME_ZRASF_ZONE_STATE_FULL = 0x06, + NVME_ZRASF_ZONE_STATE_FULL = 0x05, + NVME_ZRASF_ZONE_STATE_READONLY = 0x06, NVME_ZRASF_ZONE_STATE_OFFLINE = 0x07, NVME_REPORT_ZONE_PARTIAL = 1, }; |