From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 21 Nov 2019 17:53:47 +0000 (-0700)
Subject: Merge branch 'nvme-5.5' of git://git.infradead.org/nvme into for-5.5/drivers-post
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=866ca95da5e5c4fad59f1b08254168284bd6a911;p=linux.git

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
---

866ca95da5e5c4fad59f1b08254168284bd6a911