From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Jan 2012 02:50:26 +0000 (-0800)
Subject: Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~15772
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7b67e751479d50b7f84d1a3cc5216eed5e534b66;p=mirror_ubuntu-artful-kernel.git

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
  x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
  PCI: Increase resource array mask bit size in pcim_iomap_regions()
  PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
  PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
  PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
  x86/PCI: amd: factor out MMCONFIG discovery
  PCI: Enable ATS at the device state restore
  PCI: msi: fix imbalanced refcount of msi irq sysfs objects
  PCI: kconfig: English typo in pci/pcie/Kconfig
  PCI/PM/Runtime: make PCI traces quieter
  PCI: remove pci_create_bus()
  xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
  x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
  x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
  x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
  sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
  sparc/PCI: convert to pci_create_root_bus()
  sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
  powerpc/PCI: convert to pci_create_root_bus()
  powerpc/PCI: split PHB part out of pcibios_map_io_space()
  ...

Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
to the same patches being applied in other branches.
---

7b67e751479d50b7f84d1a3cc5216eed5e534b66
diff --cc arch/arm/mach-mv78xx0/pcie.c
index 12fcb108b0e1,c701135f139e..8459f6d7d8ca
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@@ -153,11 -153,10 +153,10 @@@ static int __init mv78xx0_pcie_setup(in
  	 * Generic PCIe unit setup.
  	 */
  	orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
 -	orion_pcie_setup(pp->base, &mv78xx0_mbus_dram_info);
 +	orion_pcie_setup(pp->base);
  
- 	sys->resource[0] = &pp->res[0];
- 	sys->resource[1] = &pp->res[1];
- 	sys->resource[2] = NULL;
+ 	pci_add_resource(&sys->resources, &pp->res[0]);
+ 	pci_add_resource(&sys->resources, &pp->res[1]);
  
  	return 1;
  }