From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Nov 2019 19:18:03 +0000 (-0800)
Subject: Merge tag 'for-5.5/drivers-post-20191122' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=323264eefba1ea288d5962c0a9e23ebd62107ca8;p=linux.git

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

323264eefba1ea288d5962c0a9e23ebd62107ca8