* stable/pvh.v7:
x86/xen: Use __pa_symbol instead of __pa on C visible symbols
xen/privcmd: fix condition in privcmd_close()
xen/x86: remove duplicated include from enlighten.c
xen: x86 pvh: use XENMEM_add_to_physmap_range for foreign gmfn mappings
xen/pvh: balloon and grant changes.
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.
xen/PVonHVM: fix compile warning in init_hvm_pv_info
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: privcmd: support autotranslated physmap guests.
xen: add pages parameter to xen_remap_domain_mfn_range
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Conflicts:
arch/arm/xen/enlighten.c
arch/x86/xen/mmu.c
drivers/xen/Makefile
drivers/xen/privcmd.c