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: baikal/mips/sdk6.1~6270
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=854d3063667c4a16719b067c786874eb9ba23592;p=kernel.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
---

854d3063667c4a16719b067c786874eb9ba23592