From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Mar 2021 18:15:25 +0000 (-0700)
Subject: Merge tag 'for-linus-5.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~1479
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c20f6df61ee7b8b562143504cf3e89ae802de87;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-5.12b-rc5-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fixes from Juergen Gross:
 "This contains a small series with a more elegant fix of a problem
  which was originally fixed in rc2"

* tag 'for-linus-5.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  Revert "xen: fix p2m size in dom0 for disabled memory hotplug case"
  xen/x86: make XEN_BALLOON_MEMORY_HOTPLUG_LIMIT depend on MEMORY_HOTPLUG
---

6c20f6df61ee7b8b562143504cf3e89ae802de87