From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Sep 2021 00:10:47 +0000 (+1000)
Subject: Merge remote-tracking branch 'pci/next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=923da569b494972070062084dc3983282dd8b901;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'pci/next'

# Conflicts:
#	MAINTAINERS
#	drivers/net/ethernet/broadcom/bnx2.c
#	drivers/net/ethernet/broadcom/bnxt/bnxt.c
---

923da569b494972070062084dc3983282dd8b901
diff --cc MAINTAINERS
index f7d880dd41eb,9f35ada234e3..33d8f53e0c88
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14523,13 -14424,13 +14525,20 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
  F:	drivers/pci/controller/dwc/pcie-histb.c
  
+ PCIE DRIVER FOR INTEL KEEM BAY
+ M:	Srikanth Thokala <srikanth.thokala@intel.com>
+ L:	linux-pci@vger.kernel.org
+ S:	Supported
+ F:	Documentation/devicetree/bindings/pci/intel,keembay-pcie*
+ F:	drivers/pci/controller/dwc/pcie-keembay.c
+ 
 +PCIE DRIVER FOR INTEL LGM GW SOC
 +M:	Rahul Tanwar <rtanwar@maxlinear.com>
 +L:	linux-pci@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
 +F:	drivers/pci/controller/dwc/pcie-intel-gw.c
 +
  PCIE DRIVER FOR MEDIATEK
  M:	Ryder Lee <ryder.lee@mediatek.com>
  M:	Jianjun Wang <jianjun.wang@mediatek.com>