diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-25 11:18:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-25 11:18:03 -0800 |
| commit | 323264eefba1ea288d5962c0a9e23ebd62107ca8 (patch) | |
| tree | c3cb5c02b1cc934ff0a5ab51734c10f65bd0a7f0 /drivers/nvme/host/Makefile | |
| parent | Merge tag 'for-5.5/drivers-20191121' of git://git.kernel.dk/linux-block (diff) | |
| parent | nbd: prevent memory leak (diff) | |
| download | linux-dev-323264eefba1ea288d5962c0a9e23ebd62107ca8.tar.xz linux-dev-323264eefba1ea288d5962c0a9e23ebd62107ca8.zip | |
Merge tag 'for-5.5/drivers-post-20191122' of git://git.kernel.dk/linux-block
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
Diffstat (limited to 'drivers/nvme/host/Makefile')
| -rw-r--r-- | drivers/nvme/host/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile index 8a4b671c5f0c..fc7b26be692d 100644 --- a/drivers/nvme/host/Makefile +++ b/drivers/nvme/host/Makefile @@ -14,6 +14,7 @@ nvme-core-$(CONFIG_TRACING) += trace.o nvme-core-$(CONFIG_NVME_MULTIPATH) += multipath.o nvme-core-$(CONFIG_NVM) += lightnvm.o nvme-core-$(CONFIG_FAULT_INJECTION_DEBUG_FS) += fault_inject.o +nvme-core-$(CONFIG_NVME_HWMON) += hwmon.o nvme-y += pci.o |