summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-04-23 11:04:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-04-23 11:04:59 -0700
commit25b1fa8dfb3fe2578c04a077953b13c534f30902 (patch)
tree58939c48e0ac2648c4f2b3308dab54f77af5bbef /MAINTAINERS
parent7adc4b399952f439cfd43ee041ec9451ad9f567f (diff)
parentef46738cc47adb6f70d548c03bd44508f18e14a5 (diff)
downloadlinux-25b1fa8dfb3fe2578c04a077953b13c534f30902.tar.gz
Merge tag 'pci-v5.7-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:

 - Workaround Apex TPU class code issue that prevents resource
   assignment (Bjorn Helgaas)

 - Update MAINTAINERS to add Rob Herring for native PCI controller
   drivers (Lorenzo Pieralisi)

* tag 'pci-v5.7-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  MAINTAINERS: Add Rob Herring and remove Andy Murray as PCI reviewers
  PCI: Move Apex Edge TPU class quirk to fix BAR assignment
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c1175fc0aadb..9c3a0e5dc66a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13050,7 +13050,7 @@ F:	drivers/pci/controller/pci-xgene-msi.c
 
 PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
 M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-R:	Andrew Murray <amurray@thegoodpenguin.co.uk>
+R:	Rob Herring <robh@kernel.org>
 L:	linux-pci@vger.kernel.org
 S:	Supported
 Q:	http://patchwork.ozlabs.org/project/linux-pci/list/