]> git.itanic.dy.fi Git - linux-stable/commitdiff
Merge tag 'nvme-6.7-2023-12-21' of git://git.infradead.org/nvme into block-6.7
authorJens Axboe <axboe@kernel.dk>
Thu, 21 Dec 2023 21:32:35 +0000 (14:32 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 21 Dec 2023 21:32:35 +0000 (14:32 -0700)
Pull NVMe fixes from Keith:

"nvme fixes for Linux 6.7

 - Revert a commit with improper sleep context (Keith)
 - Fix async event handling sleep context (Maurizio)"

* tag 'nvme-6.7-2023-12-21' of git://git.infradead.org/nvme:
  nvme-pci: fix sleeping function called from interrupt context
  Revert "nvme-fc: fix race between error recovery and creating association"


Trivial merge