Merge branch 'stable/mmu.fixes.rebased' into uek2-merge

Merge branch 'stable/mmu.fixes.rebased' into uek2-merge

* stable/mmu.fixes.rebased:
  xen/gntdev: Fix sleep-inside-spinlock
  xen: modify kernel mappings corresponding to granted pages
  xen: add an "highmem" parameter to alloc_xenballooned_pages
  xen/p2m: Use SetPagePrivate and its friends for M2P overrides.
  xen/p2m: Make debug/xen/mmu/p2m visible again.
  Revert "xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set."

Conflicts:
	drivers/xen/balloon.c
	include/xen/balloon.h