From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 20 Jan 2023 15:08:29 +0000 (-0700)
Subject: Merge tag 'nvme-6.2-2023-01-20' of git://git.infradead.org/nvme into block-6.2
X-Git-Tag: v6.6.7~3559^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=955bc12299b17aa60325e1748336e1fd1e664ed0;p=platform%2Fkernel%2Flinux-starfive.git

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

955bc12299b17aa60325e1748336e1fd1e664ed0