From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 16 Mar 2022 11:43:25 +0000 (-0600)
Subject: Merge tag 'nvme-5.17-2022-03-16' of git://git.infradead.org/nvme into block-5.17
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f6189589fa7cc4fb6b53f2929f69f0505123202f;p=linux.git

Merge tag 'nvme-5.17-2022-03-16' of git://git.infradead.org/nvme into block-5.17

Pull NVMe fix from Christoph:

"nvme fix for Linux 5.17

 - last minute revert of a nvmet feature added in Linux 5.16
   (Hannes Reinecke)"

* tag 'nvme-5.17-2022-03-16' of git://git.infradead.org/nvme:
  nvmet: revert "nvmet: make discovery NQN configurable"
---

f6189589fa7cc4fb6b53f2929f69f0505123202f