From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 21 Dec 2023 21:32:35 +0000 (-0700)
Subject: Merge tag 'nvme-6.7-2023-12-21' of git://git.infradead.org/nvme into block-6.7
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=13d822bf1cba78612b22a65b91cd6d4d443b6254;p=linux.git

Merge tag 'nvme-6.7-2023-12-21' of git://git.infradead.org/nvme into block-6.7

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"
---

13d822bf1cba78612b22a65b91cd6d4d443b6254