Merge branch 'stable/pvh.v6' into linux-next

* stable/pvh.v6:
  xen: include correct header for xen_pfn_t definition.
  xen: x86 pvh: use XENMEM_add_to_physmap_range for foreign gmfn mappings
  xen: arm: implement remap interfaces needed for privcmd mappings.
  xen: correctly use xen_pfn_t in remap_domain_mfn_range.
  xen: arm: enable balloon driver
  xen: balloon: allow PVMMU interfaces to be compiled out
  xen/pvh: /dev/xen/privcmd changes.
  xen/pvh: balloon and grant changes.
  Revert "xen/e820: Coalesce the PVH release/populate logic in the generic case."
  xen/e820: Coalesce the PVH release/populate logic in the generic case.
  xen/pvh: bootup and setup (E820) related changes.
  xen/pvh: Implement MMU changes for PVH.
  xen/pvh: Extend vcpu_guest_context, p2m, event, and XenBus.
  xen/smp: Move the common CPU init code a bit to prep for PVH patch.
  xen/pvh: Support ParaVirtualized Hardware extensions.

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

diff --cc drivers/xen/grant-table.c
Simple merge

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