From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 18 Nov 2022 14:47:54 +0000 (-0700)
Subject: Merge tag 'nvme-6.1-2022-11-18' of git://git.infradead.org/nvme into block-6.1
X-Git-Tag: v6.1-rc6~16^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c59789ce7ce994e1d9db1973a21f15481bd8513;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'nvme-6.1-2022-11-18' of git://git.infradead.org/nvme into block-6.1

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 6.1

 - two more bogus nid quirks (Bean Huo, Tiago Dias Ferreira)
 - memory leak fix in nvmet (Sagi Grimberg)"

* tag 'nvme-6.1-2022-11-18' of git://git.infradead.org/nvme:
  nvmet: fix a memory leak in nvmet_auth_set_key
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV7000
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Micron Nitro
---

5c59789ce7ce994e1d9db1973a21f15481bd8513