Merge branches 'dma-api', 'pci/virtualization', 'pci/msi', 'pci/misc' and 'pci/resour...

* dma-api:
  iommu/exynos: Remove unnecessary "&" from function pointers
  DMA-API: Update dma_pool_create ()and dma_pool_alloc() descriptions
  DMA-API: Fix duplicated word in DMA-API-HOWTO.txt
  DMA-API: Capitalize "CPU" consistently
  sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory()
  DMA-API: Change dma_declare_coherent_memory() CPU address to phys_addr_t
  DMA-API: Clarify physical/bus address distinction

* pci/virtualization:
  PCI: Mark RTL8110SC INTx masking as broken

* pci/msi:
  PCI/MSI: Remove pci_enable_msi_block()

* pci/misc:
  PCI: Remove pcibios_add_platform_entries()
  s390/pci: use pdev->dev.groups for attribute creation
  PCI: Move Open Firmware devspec attribute to PCI common code

* pci/resource:
  PCI: Add resource allocation comments
  PCI: Simplify __pci_assign_resource() coding style
  PCI: Change pbus_size_mem() return values to be more conventional
  PCI: Restrict 64-bit prefetchable bridge windows to 64-bit resources
  PCI: Support BAR sizes up to 8GB
  resources: Clarify sanity check message
  PCI: Don't add disabled subtractive decode bus resources
  PCI: Don't print anything while decoding is disabled
  PCI: Don't set BAR to zero if dma_addr_t is too small
  PCI: Don't convert BAR address to resource if dma_addr_t is too small
  PCI: Reject BAR above 4GB if dma_addr_t is too small
  PCI: Fail safely if we can't handle BARs larger than 4GB
  x86/gart: Tidy messages and add bridge device info
  x86/gart: Replace printk() with pr_info()
  x86/PCI: Move pcibios_assign_resources() annotation to definition
  x86/PCI: Mark ATI SBx00 HPET BAR as IORESOURCE_PCI_FIXED
  x86/PCI: Don't try to move IORESOURCE_PCI_FIXED resources
  x86/PCI: Fix Broadcom CNB20LE unintended sign extension

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

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

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

diff --cc drivers/pci/setup-bus.c
index d219d44709b2fe68414fecd937e7a2f29be96d35,138bdd6393be87b2ebc63ba35b1b4edaa228b8ad,138bdd6393be87b2ebc63ba35b1b4edaa228b8ad,138bdd6393be87b2ebc63ba35b1b4edaa228b8ad,d219d44709b2fe68414fecd937e7a2f29be96d35,455ee036495689e3eb6679072fecf821d5a06ee9..d9fdcea4412a927382cff551b448928e5691a89d
--- 1/drivers/pci/setup-bus.c
--- 2/drivers/pci/setup-bus.c
--- 3/drivers/pci/setup-bus.c
--- 4/drivers/pci/setup-bus.c
--- 5/drivers/pci/setup-bus.c
--- 6/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@@@@@@ -1113,11 -1113,12 -1113,12 -1113,12 -1113,11 -1123,14 +1123,13 @@@@@@@ handle_done
        ;
      }
      
 --- -void __ref __pci_bus_size_bridges(struct pci_bus *bus,
 --- -                  struct list_head *realloc_head)
 +++ +void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head)
      {
        struct pci_dev *dev;
-----   unsigned long mask, prefmask;
+++++   unsigned long mask, prefmask, type2 = 0, type3 = 0;
        resource_size_t additional_mem_size = 0, additional_io_size = 0;
+++++   struct resource *b_res;
+++++   int ret;
      
        list_for_each_entry(dev, &bus->devices, bus_list) {
                struct pci_bus *b = dev->subordinate;

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

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