From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 28 Nov 2019 14:54:54 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/misc'
X-Git-Tag: v5.10.7~3719^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48617f03c94088780c86692593b0a9b10f74530f;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'remotes/lorenzo/pci/misc'

  - Fix iproc-msi and mvebu __iomem annotations (Ben Dooks)

  - Make mvebu_pci_bridge_emul_ops static (Ben Dooks)

  - Add Marek Vasut and Yoshihiro Shimoda as R-Car maintainers (Simon
    Horman)

  - Fix pcitest.c fd leak (Hewenliang)

* remotes/lorenzo/pci/misc:
  tools: PCI: Fix fd leakage
  MAINTAINERS: Add Marek and Shimoda-san as R-Car PCIE co-maintainers
  PCI: mvebu: mvebu_pcie_map_registers __iomem fix
  PCI: mvebu: Make mvebu_pci_bridge_emul_ops static
  PCI: iproc-msi: Fix __iomem annotation in decode_msi_hwirq()
---

48617f03c94088780c86692593b0a9b10f74530f