]> www.infradead.org Git - nvme.git/commitdiff
Merge tag 'nvme-6.11-2024-08-22' of git://git.infradead.org/nvme into block-6.11
authorJens Axboe <axboe@kernel.dk>
Thu, 22 Aug 2024 22:20:24 +0000 (16:20 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 22 Aug 2024 22:20:24 +0000 (16:20 -0600)
Pull NVMe fixes from Keith:

"nvme fixes for Linux 6.11

 - Remove unused struct field (Nilay)
 - Fix fabrics keep-alive teardown order (Ming)"

* tag 'nvme-6.11-2024-08-22' of git://git.infradead.org/nvme:
  nvme: Remove unused field
  nvme: move stopping keep-alive into nvme_uninit_ctrl()


Trivial merge