From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2022 19:15:56 +0000 (-0700)
Subject: Merge tag 'block-5.17-2022-03-18' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.17~10
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6c4bcd8140770f8190a8e691aff0e3550069edb1;p=linux-block.git

Merge tag 'block-5.17-2022-03-18' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:

 - Revert of a nvme target feature (Hannes)

 - Fix a memory leak with rq-qos (Ming)

* tag 'block-5.17-2022-03-18' of git://git.kernel.dk/linux-block:
  nvmet: revert "nvmet: make discovery NQN configurable"
  block: release rq qos structures for queue without disk
---

6c4bcd8140770f8190a8e691aff0e3550069edb1