aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <[email protected]>2022-10-06 16:06:56 -0500
committerBjorn Helgaas <[email protected]>2022-10-06 16:06:56 -0500
commit0e00a3aeae255416577fc69b9b49be4778c05464 (patch)
treebb446558d3b0e1bf7fef02f9ecaba29807ab476d
parent17fc2a3f41b37596bbcf1e6b765f0620a8f34c9a (diff)
parent0e1fa5155a364de7d3de770eb382980933376699 (diff)
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 <[email protected]>
M: Lorenzo Pieralisi <[email protected]>
R: Krzysztof WilczyƄski <[email protected]>
+R: Manivannan Sadhasivam <[email protected]>
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 <[email protected]>
-M: Oliver O'Halloran <[email protected]>
+M: Mahesh J Salgaonkar <[email protected]>
+R: Oliver O'Halloran <[email protected]>
S: Supported
F: Documentation/PCI/pci-error-recovery.rst