Merge branch 'for-5.18/selftests-fixes' into for-linus

[uclinux-h8/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 855e509..fbc29cd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7417,7 +7417,6 @@ F:        include/uapi/scsi/fc/
 
 FILE LOCKING (flock() and fcntl()/lockf())
 M:     Jeff Layton <jlayton@kernel.org>
-M:     "J. Bruce Fields" <bfields@fieldses.org>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
 F:     fs/fcntl.c
@@ -10428,12 +10427,11 @@ S:    Odd Fixes
 W:     http://kernelnewbies.org/KernelJanitors
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
-M:     "J. Bruce Fields" <bfields@fieldses.org>
 M:     Chuck Lever <chuck.lever@oracle.com>
 L:     linux-nfs@vger.kernel.org
 S:     Supported
 W:     http://nfs.sourceforge.net/
-T:     git git://linux-nfs.org/~bfields/linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
 F:     fs/lockd/
 F:     fs/nfs_common/
 F:     fs/nfsd/
@@ -14892,6 +14890,19 @@ L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/PCI/pci-error-recovery.rst
 
+PCI PEER-TO-PEER DMA (P2PDMA)
+M:     Bjorn Helgaas <bhelgaas@google.com>
+M:     Logan Gunthorpe <logang@deltatee.com>
+L:     linux-pci@vger.kernel.org
+S:     Supported
+Q:     https://patchwork.kernel.org/project/linux-pci/list/
+B:     https://bugzilla.kernel.org
+C:     irc://irc.oftc.net/linux-pci
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
+F:     Documentation/driver-api/pci/p2pdma.rst
+F:     drivers/pci/p2pdma.c
+F:     include/linux/pci-p2pdma.h
+
 PCI MSI DRIVER FOR ALTERA MSI IP
 M:     Joyce Ooi <joyce.ooi@intel.com>
 L:     linux-pci@vger.kernel.org