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

* '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.

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc drivers/of/address.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

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