From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 4 Apr 2018 18:28:48 +0000 (-0500)
Subject: Merge branch '6c994c504fa2'
X-Git-Tag: v4.17-rc1~93^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=74716ff7abb483111eb44104b05799226e69b4b3;p=linux.git

Merge branch '6c994c504fa2'

  - exclude af3c73473d10 ("PCI: Improve host drivers compile test
    coverage") from lorenzo/pci/host/misc to avoid build failure

* commit '6c994c504fa2':
  PCI: v3-semi: Remove unnecessary semicolon
  PCI: rcar: Remove unnecessary semicolon
  PCI: faraday: Make struct faraday_pci_variant static
  PCI: kirin: Make struct kirin_pcie_driver static
  PCI: kirin: Fix missing dependency on PCI_MSI_IRQ_DOMAIN
  PCI: iproc: Remove dependency on ARM specific struct pci_sys_data
  PCI: kirin: Remove unnecessary asm/compiler.h include
  PCI: tegra: Add PCI_MSI_IRQ_DOMAIN kconfig dependency
  PCI: vmd: Fix malformed Kconfig default
---

74716ff7abb483111eb44104b05799226e69b4b3