diff options
author | Jens Axboe <axboe@kernel.dk> | 2023-01-20 18:08:29 +0300 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2023-01-20 18:08:29 +0300 |
commit | 955bc12299b17aa60325e1748336e1fd1e664ed0 (patch) | |
tree | 352ee97926f7f9c8a347d8109fbbffdb7607b4b6 /block | |
parent | 7746564793978fe2f43b18a302b22dca0ad3a0e8 (diff) | |
parent | 1c5842085851f786eba24a39ecd02650ad892064 (diff) | |
download | linux-955bc12299b17aa60325e1748336e1fd1e664ed0.tar.xz |
Merge tag 'nvme-6.2-2023-01-20' of git://git.infradead.org/nvme into block-6.2
Pull NVMe fixes from Christoph:
"nvme fixes for Linux 6.2
- fix controller shutdown regression in nvme-apple (Janne Grunau)
- fix a polling on timeout regression in nvme-pci (Keith Busch)"
* tag 'nvme-6.2-2023-01-20' of git://git.infradead.org/nvme:
nvme-pci: fix timeout request state check
nvme-apple: only reset the controller when RTKit is running
nvme-apple: reset controller during shutdown
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions