Skip to content

Commit

Permalink
Merge branch 'for-linus' into next
Browse files Browse the repository at this point in the history
- Add Mahesh J Salgaonkar as EEH maintainer

- Add Manivannan Sadhasivam as PCI Endpoint reviewer
  • Loading branch information
bjorn-helgaas committed Oct 6, 2022
2 parents 17fc2a3 + 0e1fa51 commit 0e00a3a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down

0 comments on commit 0e00a3a

Please sign in to comment.