From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Tue, 20 Oct 2015 01:19:19 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~257
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=813e9940e1a792247518dad6b53967e3ef0a7026;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek:
  PCI: Restore pref MMIO allocation logic for host bridge without mmio64
  PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64
  PCI: Add has_mem64 for struct host_bridge
  PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64
  PCI: Check pref compatible bit for mem64 resource of PCIe device
  OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource
  PCI: kill wrong quirk about M7101
  sparc/PCI: Keep resource idx order with bridge register number
  sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing
  sparc/PCI: Reserve legacy mmio after PCI mmio
  sparc/PCI: Unify pci_register_region()
  sparc/PCI: Use correct bus address to resource offset
  sparc/PCI: Add mem64 resource parsing for root bus
  sparc: Revert commits that broke ixgbe and igb drivers on T7
  sparc: vdso: lockdep fixes
  SPARC64: LDoms suspend domain service.
---

813e9940e1a792247518dad6b53967e3ef0a7026