Merge branch 'pci/iova-dma-ranges'

  - Add list of legal DMA address ranges to PCI host bridge (Srinath
    Mannam)

  - Reserve inaccessible DMA ranges so IOMMU doesn't allocate them (Srinath
    Mannam)

  - Parse iProc DT dma-ranges to learn what PCI devices can reach via DMA
    (Srinath Mannam)

* pci/iova-dma-ranges:
  PCI: iproc: Add sorted dma ranges resource entries to host bridge
  iommu/dma: Reserve IOVA for PCIe inaccessible DMA address
  PCI: Add dma_ranges window list

# Conflicts:
#	drivers/pci/probe.c

diff --cc drivers/pci/controller/pcie-iproc.c
Simple merge

diff --cc drivers/pci/probe.c
index 50cd9c1,2a65108..0dc42f0
--- 1/drivers/pci/probe.c
--- 2/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -586,9 -586,17 +586,10 @@@ static void pci_release_host_bridge_dev
        kfree(to_pci_host_bridge(dev));
  }
  
 -struct pci_host_bridge *pci_alloc_host_bridge(size_t priv)
 +static void pci_init_host_bridge(struct pci_host_bridge *bridge)
  {
 -      struct pci_host_bridge *bridge;
 -
 -      bridge = kzalloc(sizeof(*bridge) + priv, GFP_KERNEL);
 -      if (!bridge)
 -              return NULL;
 -
        INIT_LIST_HEAD(&bridge->windows);
 -      bridge->dev.release = pci_release_host_bridge_dev;
+       INIT_LIST_HEAD(&bridge->dma_ranges);
  
        /*
         * We assume we can manage these PCIe features.  Some systems may

diff --cc include/linux/pci.h
Simple merge