Commit 0e00a3ae authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'for-linus' into next 

- Add Mahesh J Salgaonkar as EEH maintainer

- Add Manivannan Sadhasivam as PCI Endpoint reviewer
parents 17fc2a3f 0e1fa515

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -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