commit | 6c20f6df61ee7b8b562143504cf3e89ae802de87 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 26 11:15:25 2021 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 26 11:15:25 2021 -0700 |
tree | a72a9fccede5d829da51e6d44604c01943700075 | |
parent | f944d061f847b0ccf0ebc095b5a6ba9ea9caec4e [diff] | |
parent | af44a387e743ab7aa39d3fb5e29c0a973cf91bdc [diff] |
Merge tag 'for-linus-5.12b-rc5-tag' of git://git.kernel.org/pub/scm/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