From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 9 Feb 2016 18:45:58 +0000 (-0600)
Subject: Merge branches 'pci/aer', 'pci/misc' and 'pci/virtualization' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=129aaabc84b2304d8f5f396e845bb66583e30c56;p=linux-beck.git

Merge branches 'pci/aer', 'pci/misc' and 'pci/virtualization' into next

* pci/aer:
  PCI/AER: Use list_first_entry_or_null() to simplify code
  PCI/AER: Restore pci_ops pointer while calling original pci_ops
  PCI/AER: Rename pci_ops_aer to aer_inj_pci_ops

* pci/misc:
  PCI: Remove includes of asm/pci-bridge.h
  PCI: Remove empty asm-generic/pci-bridge.h
  ARM64: PCI: Remove generated include of asm-generic/pci-bridge.h
  PCI: Remove includes of empty asm-generic/pci-bridge.h
  PCI: Move pci_set_flags() from asm-generic/pci-bridge.h to linux/pci.h
  PCI/PME: Restructure pcie_pme_suspend() to prevent compiler warning
  PCI/PME: Remove redundant port lookup
  PCI: Check device_attach() return value always

* pci/virtualization:
  PCI: Add ACS quirk for all Cavium devices
---

129aaabc84b2304d8f5f396e845bb66583e30c56