aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-09 20:43:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-09 20:43:27 -0500
commit5cff3684192773a2c2b1102acd10b99aaa6a3f67 (patch)
treee37b1ac297b4afb20befc46843e82ad0d99170af
parente7a7912a91cc1a274fab17f8a66b1e9dcfe00047 (diff)
parent6b7be529634bbfbf6395f23217a66d731fbed0a0 (diff)
Merge tag 'pci-v4.14-fixes-7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI maintainership updates from Bjorn Helgaas: "Update MAINTAINERS for HiSilicon, Microsemi Switchtec, and native host bridge drivers (Gabriele Paoloni, Sebastian Andrzej Siewior). Note that starting with changes intended for v4.16, Lorenzo Pieralisi will maintain the drivers/pci/{dwc,endpoint,host} directories. My intent is to continue to merge those changes via my tree, so this should be transparent to you" * tag 'pci-v4.14-fixes-7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: MAINTAINERS: Add Lorenzo Pieralisi for PCI host bridge drivers MAINTAINERS: Remove Gabriele Paoloni as HiSilicon PCI maintainer MAINTAINERS: Remove Stephen Bates as Microsemi Switchtec maintainer
-rw-r--r--MAINTAINERS12
1 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a7995c737728..164cf013dcb9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10341,7 +10341,6 @@ F: drivers/pci/host/vmd.c
10341 10341
10342PCI DRIVER FOR MICROSEMI SWITCHTEC 10342PCI DRIVER FOR MICROSEMI SWITCHTEC
10343M: Kurt Schwemmer <kurt.schwemmer@microsemi.com> 10343M: Kurt Schwemmer <kurt.schwemmer@microsemi.com>
10344M: Stephen Bates <stephen.bates@microsemi.com>
10345M: Logan Gunthorpe <logang@deltatee.com> 10344M: Logan Gunthorpe <logang@deltatee.com>
10346L: linux-pci@vger.kernel.org 10345L: linux-pci@vger.kernel.org
10347S: Maintained 10346S: Maintained
@@ -10406,6 +10405,7 @@ F: drivers/pci/dwc/*keystone*
10406 10405
10407PCI ENDPOINT SUBSYSTEM 10406PCI ENDPOINT SUBSYSTEM
10408M: Kishon Vijay Abraham I <kishon@ti.com> 10407M: Kishon Vijay Abraham I <kishon@ti.com>
10408M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
10409L: linux-pci@vger.kernel.org 10409L: linux-pci@vger.kernel.org
10410T: git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git 10410T: git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
10411S: Supported 10411S: Supported
@@ -10457,6 +10457,15 @@ F: include/linux/pci*
10457F: arch/x86/pci/ 10457F: arch/x86/pci/
10458F: arch/x86/kernel/quirks.c 10458F: arch/x86/kernel/quirks.c
10459 10459
10460PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
10461M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
10462L: linux-pci@vger.kernel.org
10463Q: http://patchwork.ozlabs.org/project/linux-pci/list/
10464T: git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
10465S: Supported
10466F: drivers/pci/host/
10467F: drivers/pci/dwc/
10468
10460PCIE DRIVER FOR AXIS ARTPEC 10469PCIE DRIVER FOR AXIS ARTPEC
10461M: Niklas Cassel <niklas.cassel@axis.com> 10470M: Niklas Cassel <niklas.cassel@axis.com>
10462M: Jesper Nilsson <jesper.nilsson@axis.com> 10471M: Jesper Nilsson <jesper.nilsson@axis.com>
@@ -10476,7 +10485,6 @@ F: drivers/pci/host/pci-thunder-*
10476 10485
10477PCIE DRIVER FOR HISILICON 10486PCIE DRIVER FOR HISILICON
10478M: Zhou Wang <wangzhou1@hisilicon.com> 10487M: Zhou Wang <wangzhou1@hisilicon.com>
10479M: Gabriele Paoloni <gabriele.paoloni@huawei.com>
10480L: linux-pci@vger.kernel.org 10488L: linux-pci@vger.kernel.org
10481S: Maintained 10489S: Maintained
10482F: Documentation/devicetree/bindings/pci/hisilicon-pcie.txt 10490F: Documentation/devicetree/bindings/pci/hisilicon-pcie.txt