From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 19 Mar 2015 15:56:47 +0000 (-0500)
Subject: Merge branches 'pci/iommu' and 'pci/resource' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=85e8a0af374090e0bd89b781a1d3aa0eb4fcdfa0;p=deliverable%2Flinux.git

Merge branches 'pci/iommu' and 'pci/resource' into next

* pci/iommu:
  of: Calculate device DMA masks based on DT dma-range size
  arm: dma-mapping: limit IOMMU mapping size
  PCI: Update DMA configuration from DT
  of/pci: Add of_pci_dma_configure() to update DMA configuration
  PCI: Add helper functions pci_get[put]_host_bridge_device()
  of: Fix size when dma-range is not used
  of: Move of_dma_configure() to device.c to help re-use
  of: iommu: Add ptr to OF node arg to of_iommu_configure()

* pci/resource:
  PCI: Fail pci_ioremap_bar() on unassigned resources
  PCI: Show driver, BAR#, and resource on pci_ioremap_bar() failure
  PCI: Mark invalid BARs as unassigned
  PNP: Don't check for overlaps with unassigned PCI BARs
---

85e8a0af374090e0bd89b781a1d3aa0eb4fcdfa0