From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 6 Mar 2019 21:30:23 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/misc'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5b90fc562cbc59cef10689ab0716c724d927c600;p=linux.git

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
---

5b90fc562cbc59cef10689ab0716c724d927c600