Pull additional block driver updates from Jens Axboe: "Here's another block driver update, done to avoid conflicts with the zoned changes coming next. This contains: - Prepare SCSI sd for zone open/close/finish support - Small NVMe pull request - hwmon support (Akinobu) - add new co-maintainer (Christoph) - work-around for a discard issue on non-conformant drives (Eduard) - Small nbd leak fix" * tag 'for-5.5/drivers-post-20191122' of git://git.kernel.dk/linux-block: nbd: prevent memory leak 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 scsi: sd_zbc: add zone open, close, and finish support
Showing the changes to include/linux (1 of 12 files). Show all
Unified · Split
| @@ -804,6 +804,12 @@ struct nvme_write_zeroes_cmd { · 803 unmodified lines | ||
| 804 | 804 | |
| 805 | 805 | /* Features */ |
| 806 | 806 | |
| 807 | +enum { | |
| 808 | + NVME_TEMP_THRESH_MASK = 0xffff, | |
| 809 | + NVME_TEMP_THRESH_SELECT_SHIFT = 16, | |
| 810 | + NVME_TEMP_THRESH_TYPE_UNDER = 0x100000, | |
| 811 | +}; | |
| 812 | + | |
| 807 | 813 | struct nvme_feat_auto_pst { |
| 808 | 814 | __le64 entries[32]; |
| 809 | 815 | }; |