diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-22 19:36:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-22 19:36:48 -0800 |
| commit | 5254c0cbc92d2a08e75443bdb914f1c4839cdf5a (patch) | |
| tree | 4fb7cac4385067c7a4712a2823870ddc92e51238 /drivers/input | |
| parent | 867583b3991929aeea3844874fba598243c54240 (diff) | |
| parent | 13d822bf1cba78612b22a65b91cd6d4d443b6254 (diff) | |
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"
Diffstat (limited to 'drivers/input')
0 files changed, 0 insertions, 0 deletions