Merge tag 'nvme-5.17-2022-03-16' of git://git.infradead.org/nvme into block-5.17
authorJens Axboe <axboe@kernel.dk>
Wed, 16 Mar 2022 11:43:25 +0000 (05:43 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 16 Mar 2022 11:43:25 +0000 (05:43 -0600)
commitf6189589fa7cc4fb6b53f2929f69f0505123202f
treefb84d89e72fd2682b59e32817d27cdaeeb92433c
parentdaaca3522a8e67c46e39ef09c1d542e866f85f3b
parent0c48645a7f3988a624767d025fa3275ae24b6ca1
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"