Re: [GIT PULL] xen: branch for v5.12-rc5

[pr-tracker-bot]

The pull request you sent on Fri, 26 Mar 2021 16:20:41 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git 
> for-linus-5.12b-rc5-tag

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6c20f6df61ee7b8b562143504cf3e89ae802de87

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

[GIT PULL] xen: branch for v5.12-rc5

[Juergen Gross]

Linus,

Please git pull the following tag:

 git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git 
for-linus-5.12b-rc5-tag

xen: branch for v5.12-rc5

It contains a small series with a more elegant fix of a problem which
was originally fixed in rc2.

Thanks.

Juergen

 arch/x86/include/asm/xen/page.h | 12 
 arch/x86/xen/p2m.c  |  7 ++-
 arch/x86/xen/setup.c| 16 ++--
 drivers/xen/Kconfig |  4 ++--
 4 files changed, 18 insertions(+), 21 deletions(-)

Roger Pau Monne (2):
  xen/x86: make XEN_BALLOON_MEMORY_HOTPLUG_LIMIT depend on MEMORY_HOTPLUG
  Revert "xen: fix p2m size in dom0 for disabled memory hotplug case"