Merge branch 'pci/spdx' into next

* pci/spdx:
  PCI: Add SPDX GPL-2.0+ to replace implicit GPL v2 or later statement
  PCI: Add SPDX GPL-2.0+ to replace GPL v2 or later boilerplate
  PCI: Add SPDX GPL-2.0 to replace COPYING boilerplate
  PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate
  PCI: Add SPDX GPL-2.0 when no license was specified

diff --cc drivers/pci/Kconfig
Simple merge

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

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

diff --cc drivers/pci/dwc/Kconfig
Simple merge

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

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

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

diff --cc drivers/pci/dwc/pcie-artpec6.c
Simple merge

diff --cc drivers/pci/dwc/pcie-designware-ep.c
Simple merge

diff --cc drivers/pci/dwc/pcie-designware-host.c
Simple merge

diff --cc drivers/pci/dwc/pcie-designware.c
Simple merge

diff --cc drivers/pci/dwc/pcie-designware.h
Simple merge

diff --cc drivers/pci/dwc/pcie-qcom.c
Simple merge

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

diff --cc drivers/pci/endpoint/pci-ep-cfs.c
Simple merge

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

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

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

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

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

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

diff --cc drivers/pci/host/pcie-iproc-platform.c
Simple merge

diff --cc drivers/pci/host/pcie-iproc.c
Simple merge

diff --cc drivers/pci/host/pcie-iproc.h
Simple merge

diff --cc drivers/pci/host/pcie-rcar.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/pci/of.c
index c7136e25969860de9ec5b044b7a7b187e40669fa,fd721b8140e7e70286a4f3ece767e0f62a523bd6..a28355c273ae86eb2a78771f5f95a2844755ba8f
--- 1/drivers/pci/of.c
--- 2/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@@ -2,13 -3,7 +3,8 @@@
   * PCI <-> OF mapping helpers
   *
   * Copyright 2011 IBM Corp.
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version
-  * 2 of the License, or (at your option) any later version.
   */
 +#define pr_fmt(fmt)   "PCI: OF: " fmt
  
  #include <linux/irqdomain.h>
  #include <linux/kernel.h>

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

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

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

diff --cc drivers/pci/pcie/Kconfig
Simple merge

diff --cc drivers/pci/pcie/aer/aer_inject.c
Simple merge

diff --cc drivers/pci/pcie/aer/aerdrv.c
Simple merge

diff --cc drivers/pci/pcie/aer/aerdrv_core.c
Simple merge

diff --cc drivers/pci/pcie/aer/aerdrv_errprint.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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