Merge remote-tracking branch 'pci/next'

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

diff --cc MAINTAINERS
index f7d880dd41ebd4619efd1561fe2b26bb412bc188,9f35ada234e376f5c4ad7332bd19ccf9e8c5f1a1..33d8f53e0c8895a924d6091d365508934134d7b7
--- 1/MAINTAINERS
--- 2/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>

diff --cc drivers/misc/pci_endpoint_test.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
Simple merge

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/ethernet/sfc/falcon/efx.c
Simple merge

diff --cc drivers/pci/endpoint/pci-epf-core.c
Simple merge

diff --cc drivers/pci/pci-sysfs.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/pcie/ptm.c
Simple merge

diff --cc drivers/pci/proc.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc include/linux/pci-epf.h
Simple merge

diff --cc include/linux/pci.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge