aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2022-10-06 16:06:56 -0500
committerBjorn Helgaas <bhelgaas@google.com>2022-10-06 16:06:56 -0500
commit0e00a3aeae255416577fc69b9b49be4778c05464 (patch)
treebb446558d3b0e1bf7fef02f9ecaba29807ab476d
parentMerge branch 'pci/misc' (diff)
parentMAINTAINERS: Add Mahesh J Salgaonkar as EEH maintainer (diff)
downloadlinux-dev-0e00a3aeae255416577fc69b9b49be4778c05464.tar.xz
linux-dev-0e00a3aeae255416577fc69b9b49be4778c05464.zip
Merge branch 'for-linus' into next
- Add Mahesh J Salgaonkar as EEH maintainer - Add Manivannan Sadhasivam as PCI Endpoint reviewer
-rw-r--r--MAINTAINERS5
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8a5012ba6ff9..51def5ac9462 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15682,6 +15682,7 @@ PCI ENDPOINT SUBSYSTEM
M: Kishon Vijay Abraham I <kishon@ti.com>
M: Lorenzo Pieralisi <lpieralisi@kernel.org>
R: Krzysztof WilczyƄski <kw@linux.com>
+R: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
L: linux-pci@vger.kernel.org
S: Supported
Q: https://patchwork.kernel.org/project/linux-pci/list/
@@ -15695,8 +15696,8 @@ F: drivers/pci/endpoint/
F: tools/pci/
PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
-M: Russell Currey <ruscur@russell.cc>
-M: Oliver O'Halloran <oohall@gmail.com>
+M: Mahesh J Salgaonkar <mahesh@linux.ibm.com>
+R: Oliver O'Halloran <oohall@gmail.com>
L: linuxppc-dev@lists.ozlabs.org
S: Supported
F: Documentation/PCI/pci-error-recovery.rst