]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'pci/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 00:10:47 +0000 (10:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 00:10:47 +0000 (10:10 +1000)
commit923da569b494972070062084dc3983282dd8b901
tree02a0e94cafad1b183861b910961917bea512acd3
parentacc908e59f9f8bb903e3ca679ddee29fe99e4820
parent5d7cf8d4793b604d680d268819af12f2fd0a4575
Merge remote-tracking branch 'pci/next'

# Conflicts:
# MAINTAINERS
# drivers/net/ethernet/broadcom/bnx2.c
# drivers/net/ethernet/broadcom/bnxt/bnxt.c
19 files changed:
MAINTAINERS
drivers/misc/pci_endpoint_test.c
drivers/net/ethernet/broadcom/bnx2.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
drivers/net/ethernet/sfc/efx.c
drivers/net/ethernet/sfc/falcon/efx.c
drivers/pci/endpoint/pci-epf-core.c
drivers/pci/pci-sysfs.c
drivers/pci/pci.c
drivers/pci/pci.h
drivers/pci/pcie/ptm.c
drivers/pci/proc.c
drivers/pci/quirks.c
include/linux/pci-epf.h
include/linux/pci.h
include/linux/pci_ids.h