diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-06-23 07:55:07 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-06-23 07:55:07 -0600 |
| commit | e531485a0a0e0a06644de1b639502471415d5e12 (patch) | |
| tree | bf5eb514d289d685760be77d076039b64e2ac69c /include/linux | |
| parent | ca2a3343d69741dae4df2dbb954fb806d9a835de (diff) | |
| parent | e6487833182a8a0187f0292aca542fc163ccd03e (diff) | |
Merge tag 'nvme-5.19-2022-06-23' of git://git.infradead.org/nvme into block-5.19
Pull NVMe fixes from Christoph:
"nvme fixes for Linux 5.19
- fix the mixed up CRIMS/CRWMS constants (Joel Granados)
- add another broken identifier quirk (Leo Savernik)
- fix up a quirk because Samsung reuses PCI IDs over different products
(Christoph Hellwig)"
* tag 'nvme-5.19-2022-06-23' of git://git.infradead.org/nvme:
nvme: move the Samsung X5 quirk entry to the core quirks
nvme: fix the CRIMS and CRWMS definitions to match the spec
nvme: add a bogus subsystem NQN quirk for Micron MTFDKBA2T0TFH
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 29ec3e3481ff..e3934003f239 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -233,8 +233,8 @@ enum { }; enum { - NVME_CAP_CRMS_CRIMS = 1ULL << 59, - NVME_CAP_CRMS_CRWMS = 1ULL << 60, + NVME_CAP_CRMS_CRWMS = 1ULL << 59, + NVME_CAP_CRMS_CRIMS = 1ULL << 60, }; struct nvme_id_power_state { |