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

* stable/pvh.v6.1:
  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: 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.

Conflicts:
	arch/arm/xen/enlighten.c
	arch/x86/xen/mmu.c
	drivers/xen/Makefile
	drivers/xen/privcmd.c

diff --cc arch/arm/xen/enlighten.c
index 7ef3fa918a74dd103288f263b2eefbdadab0cf61,f28fc1ac87600d4cb25d323b2a6e7aabf19e8849..d4b23f4cda989e714d106005d14b2107e10eb6b5
--- 1/arch/arm/xen/enlighten.c
--- 2/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@@ -247,15 -247,3 +247,14 @@@ static int __init xen_init_events(void
        return 0;
  }
  postcore_initcall(xen_init_events);
- 
 +
- EXPORT_SYMBOL_GPL(privcmd_call);
 +/* In the hypervisor.S file. */
 +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_xen_version);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_console_io);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_sched_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op);
 +EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);
++EXPORT_SYMBOL_GPL(privcmd_call);

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

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