From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 14 Jul 2022 16:29:56 +0000 (-0600)
Subject: Merge tag 'nvme-5.19-2022-07-14' of git://git.infradead.org/nvme into block-5.19
X-Git-Tag: v6.1-rc5~819^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c24b06e1c237ee2bf3245786b0ee844ddd1610be;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'nvme-5.19-2022-07-14' of git://git.infradead.org/nvme into block-5.19

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.19

 - fix a block device naming collision (Israel Rukshin)
 - fix freeze accounting for PCI error handling (Keith Busch)"

* tag 'nvme-5.19-2022-07-14' of git://git.infradead.org/nvme:
  nvme: fix block device naming collision
  nvme-pci: fix freeze accounting for error handling
---

c24b06e1c237ee2bf3245786b0ee844ddd1610be