diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-11-21 10:53:47 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-11-21 10:53:47 -0700 |
| commit | 866ca95da5e5c4fad59f1b08254168284bd6a911 (patch) | |
| tree | d5cc20b92cd390862c40619a0d702ce044fa3598 /drivers/block | |
| parent | ad512f2023b387d5c3c3624342c2b11de848b491 (diff) | |
| parent | 6c6aa2f26c6813af38d88718881c0307bb9a54c0 (diff) | |
Merge branch 'nvme-5.5' of git://git.infradead.org/nvme into for-5.5/drivers-post
Pull NVMe changes from Keith:
"- The only new feature is the optional hwmon support for nvme (Guenter
and Akinobu)
- A universal work-around for controllers reading discard payloads
beyond the range boundary (Eduard)
- Chaitanya graciously agreed to share the target driver maintenance"
* 'nvme-5.5' of git://git.infradead.org/nvme:
nvme: hwmon: add quirk to avoid changing temperature threshold
nvme: hwmon: provide temperature min and max values for each sensor
nvmet: add another maintainer
nvme: Discard workaround for non-conformant devices
nvme: Add hardware monitoring support
Diffstat (limited to 'drivers/block')
0 files changed, 0 insertions, 0 deletions