From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 29 Sep 2022 15:04:02 +0000 (-0600)
Subject: Merge tag 'nvme-6.0-2022-09-29' of git://git.infradead.org/nvme into block-6.0
X-Git-Tag: block-6.0-2022-09-29^0
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6c84501a3c38adaf1c3486fb80b972f728ad8fd1;p=linux-block.git

Merge tag 'nvme-6.0-2022-09-29' of git://git.infradead.org/nvme into block-6.0

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 6.1

 - fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices
   (Michael Kelley)
 - disable Write Zeroes on Phison E3C/E4C (Tina Hsu)"

* tag 'nvme-6.0-2022-09-29' of git://git.infradead.org/nvme:
  nvme-pci: disable Write Zeroes on Phison E3C/E4C
  nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices
---

6c84501a3c38adaf1c3486fb80b972f728ad8fd1