From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Dec 2023 03:36:48 +0000 (-0800)
Subject: Merge tag 'block-6.7-2023-12-22' of git://git.kernel.dk/linux
X-Git-Tag: v6.7-rc7~6
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/5254c0cbc92d2a08e75443bdb914f1c4839cdf5a

Merge tag 'block-6.7-2023-12-22' of git://git.kernel.dk/linux

Pull block fixes from Jens Axboe:
 "Just an NVMe pull request this time, with a fix for bad sleeping
  context, and a revert of a patch that caused some trouble"

* tag 'block-6.7-2023-12-22' of git://git.kernel.dk/linux:
  nvme-pci: fix sleeping function called from interrupt context
  Revert "nvme-fc: fix race between error recovery and creating association"
---

5254c0cbc92d2a08e75443bdb914f1c4839cdf5a