diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-01-12 10:36:35 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-01-12 10:36:35 -0700 |
| commit | 3d25b1e8369273d76f5f2634f164236ba9e40d32 (patch) | |
| tree | deec9a68e14f4e550c040fd7b308d50575760538 /MAINTAINERS | |
| parent | 49e4d04f0486117ac57a97890eb1db6d52bf82b3 (diff) | |
| parent | c7c0644ead24c59cc5e0f2ff0ade89b21783614a (diff) | |
| download | linux-3d25b1e8369273d76f5f2634f164236ba9e40d32.tar.gz linux-3d25b1e8369273d76f5f2634f164236ba9e40d32.tar.bz2 linux-3d25b1e8369273d76f5f2634f164236ba9e40d32.zip | |
Merge tag 'nvme-6.2-2023-01-12' of git://git.infradead.org/nvme into block-6.2
Pull NVMe fixes from Christoph:
"nvme fixes for Linux 6.2
- Identify quirks for Apple controllers (Hector Martin)
- fix error handling in nvme_pci_enable (Tong Zhang)
- refuse unprivileged passthrough on partitions (Christoph Hellwig)
- fix MAINTAINERS to not match nvmem subsystem headers (Russell King)"
* tag 'nvme-6.2-2023-01-12' of git://git.infradead.org/nvme:
MAINTAINERS: stop nvme matching for nvmem files
nvme: don't allow unprivileged passthrough on partitions
nvme: replace the "bool vec" arguments with flags in the ioctl path
nvme: remove __nvme_ioctl
nvme-pci: fix error handling in nvme_pci_enable()
nvme-pci: add NVME_QUIRK_IDENTIFY_CNS quirk to Apple T2 controllers
nvme-apple: add NVME_QUIRK_IDENTIFY_CNS quirk to fix regression
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3ef137fea4f6..b9800f5cca6d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14830,7 +14830,8 @@ T: git://git.infradead.org/nvme.git F: Documentation/nvme/ F: drivers/nvme/host/ F: drivers/nvme/common/ -F: include/linux/nvme* +F: include/linux/nvme.h +F: include/linux/nvme-*.h F: include/uapi/linux/nvme_ioctl.h NVM EXPRESS FABRICS AUTHENTICATION |