Merge branches 'pci/hotplug', 'pci/iommu', 'pci/irq' and 'pci/virtualization' into...

* pci/hotplug:
  PCI: pciehp: Remove ignored MRL sensor interrupt events
  PCI: pciehp: Remove unused interrupt events
  PCI: pciehp: Handle invalid data when reading from non-existent devices
  PCI: Hold pci_slot_mutex while searching bus->slots list
  PCI: Protect pci_bus->slots with pci_slot_mutex, not pci_bus_sem
  PCI: pciehp: Simplify pcie_poll_cmd()
  PCI: Use "slot" and "pci_slot" for struct hotplug_slot and struct pci_slot

* pci/iommu:
  PCI: Remove pci_ats_enabled()
  PCI: Stop caching ATS Invalidate Queue Depth
  PCI: Move ATS declarations to linux/pci.h so they're all together
  PCI: Clean up ATS error handling
  PCI: Use pci_physfn() rather than looking up physfn by hand
  PCI: Inline the ATS setup code into pci_ats_init()
  PCI: Rationalize pci_ats_queue_depth() error checking
  PCI: Reduce size of ATS structure elements
  PCI: Embed ATS info directly into struct pci_dev
  PCI: Allocate ATS struct during enumeration
  iommu/vt-d: Cache PCI ATS state and Invalidate Queue Depth

* pci/irq:
  PCI: Kill off set_irq_flags() usage

* pci/virtualization:
  PCI: Add ACS quirks for Intel I219-LM/V

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

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

diff --cc drivers/pci/host/pcie-xilinx.c
index dcb9b57ed7eac144467fce85089c8a6bafa2a144,f1a06a091ccb578359656b1d9c4b32c0e99b2d99,f1a06a091ccb578359656b1d9c4b32c0e99b2d99,7201511972ad8bf17e0623813b972f0cbefd0a21,f1a06a091ccb578359656b1d9c4b32c0e99b2d99..0e1f480b9db4ef1c85a1c54f22456ed55ab0761d
--- 1/drivers/pci/host/pcie-xilinx.c
--- 2/drivers/pci/host/pcie-xilinx.c
--- 3/drivers/pci/host/pcie-xilinx.c
--- 4/drivers/pci/host/pcie-xilinx.c
--- 5/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@@@@@ -449,17 -449,14 -449,14 -447,14 -449,14 +447,17 @@@@@@ static irqreturn_t xilinx_pcie_intr_han
                        return IRQ_HANDLED;
                }
     
 ----           /* Clear interrupt FIFO register 1 */
 ----           pcie_write(port, XILINX_PCIE_RPIFR1_ALL_MASK,
 ----                      XILINX_PCIE_REG_RPIFR1);
   - 
   -            /* Handle INTx Interrupt */
   -            val = ((val & XILINX_PCIE_RPIFR1_INTR_MASK) >>
   -                    XILINX_PCIE_RPIFR1_INTR_SHIFT) + 1;
   -            generic_handle_irq(irq_find_mapping(port->irq_domain, val));
 ++++           if (!(val & XILINX_PCIE_RPIFR1_MSI_INTR)) {
 ++++                   /* Clear interrupt FIFO register 1 */
 ++++                   pcie_write(port, XILINX_PCIE_RPIFR1_ALL_MASK,
 ++++                              XILINX_PCIE_REG_RPIFR1);
   + 
 -- -           /* Handle INTx Interrupt */
 -- -           val = ((val & XILINX_PCIE_RPIFR1_INTR_MASK) >>
 -- -                   XILINX_PCIE_RPIFR1_INTR_SHIFT) + 1;
 -- -           generic_handle_irq(irq_find_mapping(port->irq_domain, val));
 ++++                   /* Handle INTx Interrupt */
 ++++                   val = ((val & XILINX_PCIE_RPIFR1_INTR_MASK) >>
 ++++                           XILINX_PCIE_RPIFR1_INTR_SHIFT) + 1;
 ++++                   generic_handle_irq(irq_find_mapping(port->irq_domain,
 ++++                                                       val));
 ++++           }
        }
     
        if (status & XILINX_PCIE_INTR_MSI) {

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

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

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