diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-07-07 17:38:19 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-07-07 17:38:19 -0600 |
| commit | 6b0de7d0f3285df849be2b3cc94fc3a0a31987bf (patch) | |
| tree | abc7b49e082fbcdfbeb6cc6beb26cb4f648d6c12 /include/linux/nvme.h | |
| parent | f3163d8567adbfebe574fb22c647ce5b829c5971 (diff) | |
| parent | 5c629dc9609dc43492a7bc8060cc6120875bf096 (diff) | |
Merge tag 'nvme-5.19-2022-07-07' of git://git.infradead.org/nvme into block-5.19block-5.19-2022-07-08
Pull NVMe fixes from Christoph:
"nvme fixes for Linux 5.19
- another bogus identifier quirk (Keith Busch)
- use struct group in the tracer to avoid a gcc warning (Keith Busch)"
* tag 'nvme-5.19-2022-07-07' of git://git.infradead.org/nvme:
nvme: use struct group for generic command dwords
nvme-pci: phison e16 has bogus namespace ids
Diffstat (limited to 'include/linux/nvme.h')
| -rw-r--r-- | include/linux/nvme.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index e3934003f239..07cfc922f8e4 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -906,12 +906,14 @@ struct nvme_common_command { __le32 cdw2[2]; __le64 metadata; union nvme_data_ptr dptr; + struct_group(cdws, __le32 cdw10; __le32 cdw11; __le32 cdw12; __le32 cdw13; __le32 cdw14; __le32 cdw15; + ); }; struct nvme_rw_command { |