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

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (109 commits)
  PCI: fix coding style issue in pci_save_state()
  PCI: add pci_request_acs
  PCI: fix BUG_ON triggered by logical PCIe root port removal
  PCI: remove ifdefed pci_cleanup_aer_correct_error_status
  PCI: unconditionally clear AER uncorr status register during cleanup
  x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
  PCI: portdrv: remove redundant definitions
  PCI: portdrv: remove unnecessary struct pcie_port_data
  PCI: portdrv: minor cleanup for pcie_port_device_register
  PCI: portdrv: add missing irq cleanup
  PCI: portdrv: enable device before irq initialization
  PCI: portdrv: cleanup service irqs initialization
  PCI: portdrv: check capabilities first
  PCI: portdrv: move PME capability check
  PCI: portdrv: remove redundant pcie type calculation
  PCI: portdrv: cleanup pcie_device registration
  PCI: portdrv: remove redundant pcie_port_device_probe
  PCI: Always set prefetchable base/limit upper32 registers
  PCI: read-modify-write the pcie device control register when initiating pcie flr
  PCI: show dma_mask bits in /sys
  ...

Fixed up conflicts in:
	arch/x86/kernel/amd_iommu_init.c
	drivers/pci/dmar.c
	drivers/pci/hotplug/acpiphp_glue.c

diff --cc arch/x86/kernel/amd_iommu_init.c
index 7ffc39965233ce570a7b734f12636ce05e403d1e,e60530a5f52454a4a6bea91590dd3434ed117d1b..9c4a6f7475525469760ca7cc43ad98d7e842c8f2
--- 1/arch/x86/kernel/amd_iommu_init.c
--- 2/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@@ -1335,7 -1326,12 +1335,10 @@@ void __init amd_iommu_detect(void
        if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
                iommu_detected = 1;
                amd_iommu_detected = 1;
 -#ifdef CONFIG_GART_IOMMU
 -              gart_iommu_aperture_disabled = 1;
 -              gart_iommu_aperture = 0;
 -#endif
 +              x86_init.iommu.iommu_init = amd_iommu_init;
++
+               /* Make sure ACS will be enabled */
+               pci_request_acs();
        }
  }
  

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/char/hvc_xen.c
Simple merge

diff --cc drivers/pci/dmar.c
index 416f6ac65b761080a2e81a8ace5c5d442a8ea2d1,0e98f6b6f515503345ba8fe3f12c5ccf64211d60..6cdc931f7c1773e6fb59b2c8bbac85df950a9f86
--- 1/drivers/pci/dmar.c
--- 2/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -645,12 -613,12 +645,15 @@@ void __init detect_intel_iommu(void
                               "x2apic and Intr-remapping.\n");
  #endif
  #ifdef CONFIG_DMAR
-               if (ret && !no_iommu && !iommu_detected && !dmar_disabled)
 -              if (ret && !no_iommu && !iommu_detected && !swiotlb &&
 -                  !dmar_disabled) {
++              if (ret && !no_iommu && !iommu_detected && !dmar_disabled) {
                        iommu_detected = 1;
+                       /* Make sure ACS will be enabled */
+                       pci_request_acs();
+               }
 +#endif
 +#ifdef CONFIG_X86
 +              if (ret)
 +                      x86_init.iommu.iommu_init = intel_iommu_init;
  #endif
        }
        early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);

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

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

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

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

diff --cc drivers/pcmcia/cardbus.c
Simple merge

diff --cc drivers/video/xen-fbfront.c
Simple merge

diff --cc drivers/xen/balloon.c
Simple merge

diff --cc drivers/xen/cpu_hotplug.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe.c
Simple merge