Merge branch 'for-linus' into next

bjorn-helgaas · bjorn-helgaas · commit 0e00a3aeae25 · 2022-10-06T16:06:56.000-05:00
- Add Mahesh J Salgaonkar as EEH maintainer

- Add Manivannan Sadhasivam as PCI Endpoint reviewer
diff --git 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

-Original file line number
+Diff line change
 M:	Kishon Vijay Abraham I <[email protected]>
 M:	Lorenzo Pieralisi <[email protected]>
 R:	Krzysztof Wilczyński <[email protected]>
 +R:	Manivannan Sadhasivam <[email protected]>
 L:	[email protected]
 S:	Supported
 Q:	https://patchwork.kernel.org/project/linux-pci/list/
 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]>
 L:	[email protected]
 S:	Supported
 F:	Documentation/PCI/pci-error-recovery.rst