Merge tag 'block-5.17-2022-03-18' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2022 19:15:56 +0000 (12:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2022 19:15:56 +0000 (12:15 -0700)
commit6c4bcd8140770f8190a8e691aff0e3550069edb1
treee1fbd32eee6fdb52b9a2ce9fbad02f99591b2bd5
parentcced5148a1303a2ec57d04a7745a560821b45280
parentf6189589fa7cc4fb6b53f2929f69f0505123202f
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