Merge branch 'pci/misc'

- Remove unused tools 'pci' build target left over after moving tests to
  tools/testing/selftests/pci_endpoint (Jianfeng Liu)

- Fix typos and whitespace errors (Bjorn Helgaas)

* pci/misc:
  PCI: Fix typos
  tools/Makefile: Remove pci target

# Conflicts:
#	drivers/pci/endpoint/functions/pci-epf-test.c

diff --cc drivers/pci/controller/cadence/pcie-cadence-ep.c
Simple merge

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

diff --cc drivers/pci/controller/pcie-altera.c
Simple merge

diff --cc drivers/pci/controller/pcie-brcmstb.c
Simple merge

diff --cc drivers/pci/endpoint/functions/pci-epf-test.c
index ac3ec883cc71f3bcc32dc184165c102b26185a90,ee1416c43f03c9e15ce39b32a17fcb5107db444b..50eb4106369f41afa00ed3ae58c84922e0a49e51
--- 1/drivers/pci/endpoint/functions/pci-epf-test.c
--- 2/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@@ -653,9 -631,9 +653,9 @@@ static void pci_epf_test_raise_irq(stru
                break;
        case IRQ_TYPE_MSIX:
                count = pci_epc_get_msix(epc, epf->func_no, epf->vfunc_no);
 -              if (reg->irq_number > count || count <= 0) {
 +              if (irq_number > count || count <= 0) {
-                       dev_err(dev, "Invalid MSIX IRQ number %d / %d\n",
+                       dev_err(dev, "Invalid MSI-X IRQ number %d / %d\n",
 -                              reg->irq_number, count);
 +                              irq_number, count);
                        return;
                }
                pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no,

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

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

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

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

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