diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-09 20:43:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-09 20:43:27 -0500 |
| commit | 5cff3684192773a2c2b1102acd10b99aaa6a3f67 (patch) | |
| tree | e37b1ac297b4afb20befc46843e82ad0d99170af | |
| parent | e7a7912a91cc1a274fab17f8a66b1e9dcfe00047 (diff) | |
| parent | 6b7be529634bbfbf6395f23217a66d731fbed0a0 (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-- | MAINTAINERS | 12 |
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 | ||
| 10342 | PCI DRIVER FOR MICROSEMI SWITCHTEC | 10342 | PCI DRIVER FOR MICROSEMI SWITCHTEC |
| 10343 | M: Kurt Schwemmer <kurt.schwemmer@microsemi.com> | 10343 | M: Kurt Schwemmer <kurt.schwemmer@microsemi.com> |
| 10344 | M: Stephen Bates <stephen.bates@microsemi.com> | ||
| 10345 | M: Logan Gunthorpe <logang@deltatee.com> | 10344 | M: Logan Gunthorpe <logang@deltatee.com> |
| 10346 | L: linux-pci@vger.kernel.org | 10345 | L: linux-pci@vger.kernel.org |
| 10347 | S: Maintained | 10346 | S: Maintained |
| @@ -10406,6 +10405,7 @@ F: drivers/pci/dwc/*keystone* | |||
| 10406 | 10405 | ||
| 10407 | PCI ENDPOINT SUBSYSTEM | 10406 | PCI ENDPOINT SUBSYSTEM |
| 10408 | M: Kishon Vijay Abraham I <kishon@ti.com> | 10407 | M: Kishon Vijay Abraham I <kishon@ti.com> |
| 10408 | M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | ||
| 10409 | L: linux-pci@vger.kernel.org | 10409 | L: linux-pci@vger.kernel.org |
| 10410 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git | 10410 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git |
| 10411 | S: Supported | 10411 | S: Supported |
| @@ -10457,6 +10457,15 @@ F: include/linux/pci* | |||
| 10457 | F: arch/x86/pci/ | 10457 | F: arch/x86/pci/ |
| 10458 | F: arch/x86/kernel/quirks.c | 10458 | F: arch/x86/kernel/quirks.c |
| 10459 | 10459 | ||
| 10460 | PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS | ||
| 10461 | M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | ||
| 10462 | L: linux-pci@vger.kernel.org | ||
| 10463 | Q: http://patchwork.ozlabs.org/project/linux-pci/list/ | ||
| 10464 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/ | ||
| 10465 | S: Supported | ||
| 10466 | F: drivers/pci/host/ | ||
| 10467 | F: drivers/pci/dwc/ | ||
| 10468 | |||
| 10460 | PCIE DRIVER FOR AXIS ARTPEC | 10469 | PCIE DRIVER FOR AXIS ARTPEC |
| 10461 | M: Niklas Cassel <niklas.cassel@axis.com> | 10470 | M: Niklas Cassel <niklas.cassel@axis.com> |
| 10462 | M: Jesper Nilsson <jesper.nilsson@axis.com> | 10471 | M: Jesper Nilsson <jesper.nilsson@axis.com> |
| @@ -10476,7 +10485,6 @@ F: drivers/pci/host/pci-thunder-* | |||
| 10476 | 10485 | ||
| 10477 | PCIE DRIVER FOR HISILICON | 10486 | PCIE DRIVER FOR HISILICON |
| 10478 | M: Zhou Wang <wangzhou1@hisilicon.com> | 10487 | M: Zhou Wang <wangzhou1@hisilicon.com> |
| 10479 | M: Gabriele Paoloni <gabriele.paoloni@huawei.com> | ||
| 10480 | L: linux-pci@vger.kernel.org | 10488 | L: linux-pci@vger.kernel.org |
| 10481 | S: Maintained | 10489 | S: Maintained |
| 10482 | F: Documentation/devicetree/bindings/pci/hisilicon-pcie.txt | 10490 | F: Documentation/devicetree/bindings/pci/hisilicon-pcie.txt |
