diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-03-05 09:13:07 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-03-05 09:13:07 -0700 |
| commit | a2b658e4a07d05fcf056e2b9524ed8cc214f486a (patch) | |
| tree | 998d7f00c98c8e32455368f243f5ccef5ab577bf /drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | |
| parent | 77516d25f54912a7baedeeac1b1b828b6f285152 (diff) | |
| parent | d9f273b7585c380d7a10d4b3187ddc2d37f2740b (diff) | |
Merge tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme into block-5.12
Pull NVMe fixes from Christoph:
"nvme fixes for 5.12:
- more device quirks (Julian Einwag, Zoltán Böszörményi, Pascal Terjan)
- fix a hwmon error return (Daniel Wagner)
- fix the keep alive timeout initialization (Martin George)
- ensure the model_number can't be changed on a used subsystem
(Max Gurtovoy)"
* tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme:
nvmet: model_number must be immutable once set
nvme-fabrics: fix kato initialization
nvme-hwmon: Return error code when registration fails
nvme-pci: add quirks for Lexar 256GB SSD
nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state
nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c')
0 files changed, 0 insertions, 0 deletions