From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Sep 2022 16:33:33 +0000 (-0700)
Subject: Merge tag 'block-6.0-2022-09-29' of git://git.kernel.dk/linux
X-Git-Tag: v6.0~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7bc6e90d7aa4170039abe80b9f4e8c8e4eb35091;p=linux-block.git

Merge tag 'block-6.0-2022-09-29' of git://git.kernel.dk/linux

Pull block fixes from Jens Axboe:
 "A single NVMe pull request via Christoph with a few fixes that should
  go into the 6.0 release:

   - Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices
     (Michael Kelley)

   - Disable Write Zeroes on Phison E3C/E4C (Tina Hsu)"

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

7bc6e90d7aa4170039abe80b9f4e8c8e4eb35091