Merge branch 'remotes/lorenzo/pci/misc'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Mar 2019 21:30:23 +0000 (15:30 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Mar 2019 21:30:23 +0000 (15:30 -0600)
commit5b90fc562cbc59cef10689ab0716c724d927c600
tree6afa0c3deefa7702c2919567e678f5c43683cb45
parentd00aaa88c33a9df2ce72a1cffd940c2338801046
parentd3b34d048b7c1a4aac9f2e2e6ff6b0e21e50719e
Merge branch 'remotes/lorenzo/pci/misc'

  - Fix mvebu prefetchable BAR regression caused by common bridge emulation
    that assumed all bridges had prefetchable windows (Thomas Petazzoni)

  - Make advk_pci_bridge_emul_ops static (Wei Yongjun)

* remotes/lorenzo/pci/misc:
  PCI: aardvark: Make symbol 'advk_pci_bridge_emul_ops' static
  PCI: pci-bridge-emul: Extend pci_bridge_emul_init() with flags
  PCI: pci-bridge-emul: Create per-bridge copy of register behavior