Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel...

  and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm

* 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
  xen: register xen pci notifier
  xen: initialize cpu masks for pv guests in xen_smp_init
  xen: add a missing #include to arch/x86/pci/xen.c
  xen: mask the MTRR feature from the cpuid
  xen: make hvc_xen console work for dom0.
  xen: add the direct mapping area for ISA bus access
  xen: Initialize xenbus for dom0.
  xen: use vcpu_ops to setup cpu masks
  xen: map a dummy page for local apic and ioapic in xen_set_fixmap
  xen: remap MSIs into pirqs when running as initial domain
  xen: remap GSIs as pirqs when running as initial domain
  xen: introduce XEN_DOM0 as a silent option
  xen: map MSIs into pirqs
  xen: support GSI -> pirq remapping in PV on HVM guests
  xen: add xen hvm acpi_register_gsi variant
  acpi: use indirect call to register gsi in different modes
  xen: implement xen_hvm_register_pirq
  xen: get the maximum number of pirqs from xen
  xen: support pirq != irq

* 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits)
  X86/PCI: Remove the dependency on isapnp_disable.
  xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
  MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright.
  x86: xen: Sanitse irq handling (part two)
  swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it.
  MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer.
  xen/pci: Request ACS when Xen-SWIOTLB is activated.
  xen-pcifront: Xen PCI frontend driver.
  xenbus: prevent warnings on unhandled enumeration values
  xenbus: Xen paravirtualised PCI hotplug support.
  xen/x86/PCI: Add support for the Xen PCI subsystem
  x86: Introduce x86_msi_ops
  msi: Introduce default_[teardown|setup]_msi_irqs with fallback.
  x86/PCI: Export pci_walk_bus function.
  x86/PCI: make sure _PAGE_IOMAP it set on pci mappings
  x86/PCI: Clean up pci_cache_line_size
  xen: fix shared irq device passthrough
  xen: Provide a variant of xen_poll_irq with timeout.
  xen: Find an unbound irq number in reverse order (high to low).
  xen: statically initialize cpu_evtchn_mask_p
  ...

Fix up trivial conflicts in drivers/pci/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/io.h
index f0203f4791a8924a94a31d92fe78c298c3f3dd64,0ad29d4015654f059f068ee79c0f7680cf931208..072273082528c3bcff89ca88d9d98e26567c38df
--- 1/arch/x86/include/asm/io.h
--- 2/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@@ -349,8 -350,18 +351,19 @@@ extern void __iomem *early_memremap(res
                                    unsigned long size);
  extern void early_iounmap(void __iomem *addr, unsigned long size);
  extern void fixup_early_ioremap(void);
 +extern bool is_early_ioremap_ptep(pte_t *ptep);
  
+ #ifdef CONFIG_XEN
+ struct bio_vec;
+ 
+ extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
+                                     const struct bio_vec *vec2);
+ 
+ #define BIOVEC_PHYS_MERGEABLE(vec1, vec2)                             \
+       (__BIOVEC_PHYS_MERGEABLE(vec1, vec2) &&                         \
+        (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)))
+ #endif        /* CONFIG_XEN */
+ 
  #define IO_SPACE_LIMIT 0xffff
  
  #endif /* _ASM_X86_IO_H */

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc arch/x86/pci/i386.c
Simple merge

diff --cc arch/x86/xen/Kconfig
Simple merge

diff --cc arch/x86/xen/enlighten.c
index 70ddeaeb1ef366c7e84ba520488f85a546d3e40a,d48a32b10a3cdbd6c3bb8b9af75de8a3a55c0ab1..235c0f4d3861da6f1c9d64ded710c7c2176cf895
--- 1/arch/x86/xen/enlighten.c
--- 2/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -1180,14 -1185,10 +1182,15 @@@ asmlinkage void __init xen_start_kernel
        local_irq_disable();
        early_boot_irqs_off();
  
 +      memblock_init();
 +
        xen_raw_console_write("mapping kernel into physical memory\n");
        pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
+       xen_ident_map_ISA();
  
 +      /* Allocate and initialize top and mid mfn levels for p2m structure */
 +      xen_build_mfn_list_list();
 +
        init_mm.pgd = pgd;
  
        /* keep using Xen gdt for now; no urgent need to change it */

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

diff --cc arch/x86/xen/pci-swiotlb-xen.c
index 22471001b74c48dc26e499a549d4eb8549ed48e3,be4d80a6fae9d3bd267a9a748771cd5f7522dc2e..bfd0632fe65ec79e593aa66a14e77b66152737e4
--- 1/arch/x86/xen/pci-swiotlb-xen.c
--- 2/arch/x86/xen/pci-swiotlb-xen.c
+++ b/arch/x86/xen/pci-swiotlb-xen.c
@@@ -55,9 -55,8 +56,12 @@@ void __init pci_xen_swiotlb_init(void
        if (xen_swiotlb) {
                xen_swiotlb_init(1);
                dma_ops = &xen_swiotlb_dma_ops;
+ 
+               /* Make sure ACS will be enabled */
+               pci_request_acs();
        }
  }
 +IOMMU_INIT_FINISH(pci_xen_swiotlb_detect,
 +                0,
 +                pci_xen_swiotlb_init,
 +                0);

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

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

diff --cc drivers/block/xen-blkfront.c
Simple merge

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

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc drivers/pci/Makefile
index dcd7ace9221ea86d679f14f2557f874e15c53e4b,d5e27050c4e3b7687f271fec691568d0c2520750..f01e344cf4bd673c059044698f50896836d26fad
--- 1/drivers/pci/Makefile
--- 2/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -65,4 -65,8 +65,6 @@@ obj-$(CONFIG_PCI_SYSCALL) += syscall.
  
  obj-$(CONFIG_PCI_STUB) += pci-stub.o
  
 -ifeq ($(CONFIG_PCI_DEBUG),y)
 -EXTRA_CFLAGS += -DDEBUG
 -endif
+ obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
+ 
 +ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG

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

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

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