diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2022-03-29 06:22:38 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-29 06:22:38 -0600 |
| commit | 1e06b3e71e07e0dd8801edc4f26ea1411d1d34c2 (patch) | |
| tree | 5317ce12df5ed4174721cb57efef9eb4dc342aa5 /include | |
| parent | n64cart: convert bi_disk to bi_bdev->bd_disk fix build (diff) | |
| parent | nvme-multipath: fix hang when disk goes live over reconnect (diff) | |
| download | linux-dev-1e06b3e71e07e0dd8801edc4f26ea1411d1d34c2.tar.xz linux-dev-1e06b3e71e07e0dd8801edc4f26ea1411d1d34c2.zip | |
Merge tag 'nvme-5.18-2022-03-29' of git://git.infradead.org/nvme into for-5.18/drivers
Pull NVMe fixes from Christoph:
"- fix multipath hang when disk goes live over reconnect (Anton Eidelman)
- fix RCU hole that allowed for endless looping in multipath round robin
(Chris Leech)
- remove redundant assignment after left shift (Colin Ian King)
- add quirks for Samsung X5 SSDs (Monish Kumar R)
- fix the read-only state for zoned namespaces with unsupposed features
(Pankaj Raghav)
- use a private workqueue instead of the system workqueue in nvmet
(Sagi Grimberg)
- allow duplicate NSIDs for private namespaces (Sungup Moon)
- expose use_threaded_interrupts read-only in sysfs (Xin Hao)"
* tag 'nvme-5.18-2022-03-29' of git://git.infradead.org/nvme:
nvme-multipath: fix hang when disk goes live over reconnect
nvme: fix RCU hole that allowed for endless looping in multipath round robin
nvme: allow duplicate NSIDs for private namespaces
nvmet: remove redundant assignment after left shift
nvmet: use a private workqueue instead of the system workqueue
nvme-pci: add quirks for Samsung X5 SSDs
nvme-pci: expose use_threaded_interrupts read-only in sysfs
nvme: fix the read-only state for zoned namespaces with unsupposed features
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvme.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 9dbc3ef4daf7..2dcee34d467d 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -345,6 +345,7 @@ enum { NVME_CTRL_ONCS_TIMESTAMP = 1 << 6, NVME_CTRL_VWC_PRESENT = 1 << 0, NVME_CTRL_OACS_SEC_SUPP = 1 << 0, + NVME_CTRL_OACS_NS_MNGT_SUPP = 1 << 3, NVME_CTRL_OACS_DIRECTIVES = 1 << 5, NVME_CTRL_OACS_DBBUF_SUPP = 1 << 8, NVME_CTRL_LPA_CMD_EFFECTS_LOG = 1 << 1, |