aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2019-11-21 10:53:47 -0700
committerJens Axboe <axboe@kernel.dk>2019-11-21 10:53:47 -0700
commit866ca95da5e5c4fad59f1b08254168284bd6a911 (patch)
treed5cc20b92cd390862c40619a0d702ce044fa3598 /MAINTAINERS
parentscsi: sd_zbc: add zone open, close, and finish support (diff)
parentnvme: hwmon: add quirk to avoid changing temperature threshold (diff)
downloadlinux-dev-866ca95da5e5c4fad59f1b08254168284bd6a911.tar.xz
linux-dev-866ca95da5e5c4fad59f1b08254168284bd6a911.zip
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 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b3bbb1784913..af238ff220f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11633,6 +11633,7 @@ F: drivers/nvme/target/fcloop.c
NVM EXPRESS TARGET DRIVER
M: Christoph Hellwig <hch@lst.de>
M: Sagi Grimberg <sagi@grimberg.me>
+M: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
L: linux-nvme@lists.infradead.org
T: git://git.infradead.org/nvme.git
W: http://git.infradead.org/nvme.git