summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-01-13 17:41:19 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2023-01-13 17:41:19 -0600
commit97ec4d559d939743e8af83628be5af8da610d9dc (patch)
tree346e3cf65e037d89598f0334e0099c16a1128e1f /MAINTAINERS
parent2ce7592df99f7356cc8697ad10849987237abca4 (diff)
parent3d25b1e8369273d76f5f2634f164236ba9e40d32 (diff)
downloadlinux-97ec4d559d939743e8af83628be5af8da610d9dc.tar.gz
linux-97ec4d559d939743e8af83628be5af8da610d9dc.tar.bz2
linux-97ec4d559d939743e8af83628be5af8da610d9dc.zip
Merge tag 'block-6.2-2023-01-13' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe: "Nothing major in here, just a collection of NVMe fixes and dropping a wrong might_sleep() that static checkers tripped over but which isn't valid" * tag 'block-6.2-2023-01-13' of git://git.kernel.dk/linux: 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 block: Drop spurious might_sleep() from blk_put_queue()
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bf14f25840d2..42fc47c6edfd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14919,7 +14919,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