git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 867583b 13d822b)
Merge tag 'block-6.7-2023-12-22' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Dec 2023 03:36:48 +0000 (19:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Dec 2023 03:36:48 +0000 (19:36 -0800)
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"


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.