| commit | 7bc6e90d7aa4170039abe80b9f4e8c8e4eb35091 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 30 09:33:33 2022 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 30 09:33:33 2022 -0700 |
| tree | 14bc5b5b614437063a144a439ab529e1887b003b | |
| parent | a0debc4c7a7e1a4adf0866b105e9e4f29002c2ca [diff] | |
| parent | 6c84501a3c38adaf1c3486fb80b972f728ad8fd1 [diff] |
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