diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-01 16:44:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-01 16:44:42 -0800 |
commit | 4db5e636ddca41f4292359fdb3ac7cc4346a359a (patch) | |
tree | 7cad70c84b3a7a79dce4f77ec7f51ec4621d7f56 /MAINTAINERS | |
parent | 2caceb3294a78c389b462e7e236a4e744a53a474 (diff) | |
parent | e42010d8207f9d15a605ceb8e321bcd9648071b0 (diff) |
Merge tag 'pci-v4.9-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"PCI fixes:
- Fix Read Completion Boundary setting, which fixes a boot failure on
IBM x3850 with Mellanox MT27500 ConnectX-3
- Update some MAINTAINERS entries and email addresses"
* tag 'pci-v4.9-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX)
PCI: Export pcie_find_root_port
PCI: designware-plat: Update author email
PCI: designware: Change maintainer to Joao Pinto
MAINTAINERS: Add devicetree binding to PCI i.MX6 entry
MAINTAINERS: Update Richard Zhu's email address
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8d4148406923..63cefa62324c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9257,11 +9257,12 @@ S: Maintained F: drivers/pci/host/*layerscape* PCI DRIVER FOR IMX6 -M: Richard Zhu <Richard.Zhu@freescale.com> +M: Richard Zhu <hongxing.zhu@nxp.com> M: Lucas Stach <l.stach@pengutronix.de> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt F: drivers/pci/host/*imx6* PCI DRIVER FOR TI KEYSTONE @@ -9320,17 +9321,11 @@ F: drivers/pci/host/pci-exynos.c PCI DRIVER FOR SYNOPSIS DESIGNWARE M: Jingoo Han <jingoohan1@gmail.com> -M: Pratyush Anand <pratyush.anand@gmail.com> -L: linux-pci@vger.kernel.org -S: Maintained -F: drivers/pci/host/*designware* - -PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE -M: Jose Abreu <Jose.Abreu@synopsys.com> +M: Joao Pinto <Joao.Pinto@synopsys.com> L: linux-pci@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/pci/designware-pcie.txt -F: drivers/pci/host/pcie-designware-plat.c +F: drivers/pci/host/*designware* PCI DRIVER FOR GENERIC OF HOSTS M: Will Deacon <will.deacon@arm.com> |