diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-08 11:32:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-08 11:32:23 -0700 |
| commit | a471da3100ef2e8feb8449d378a52e29dd1e9ae1 (patch) | |
| tree | a73f312cf10e4b2ce32dfeb19273d39ed861177d /include/linux | |
| parent | 29837019d5ebb80a5f180af3107a0645c731a770 (diff) | |
| parent | 6b0de7d0f3285df849be2b3cc94fc3a0a31987bf (diff) | |
Merge tag 'block-5.19-2022-07-08' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"NVMe pull request with another id quirk addition, and a tracing fix"
* tag 'block-5.19-2022-07-08' of git://git.kernel.dk/linux-block:
nvme: use struct group for generic command dwords
nvme-pci: phison e16 has bogus namespace ids
Diffstat (limited to 'include/linux')
| -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 { |