2012-08-23

Hey Linus,

Please pull this following git tag:

git pull git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-linus-3.6-rc3-tag

which has three bug-fixes. The tag has a brief writeup of what they are - but

basically one is a revert for a that went in v3.6 and is not yet ready. The

other two are fixes - one for a one-off bug that has been for some time in the

kernel. The other is a fix for code that went in v3.5.

Please pull and here is an double-checked output:

arch/x86/xen/enlighten.c | 118 ++++---------------------------------------

arch/x86/xen/p2m.c | 95 ++++++++++++++++++++++++++++++++++-

arch/x86/xen/setup.c | 9 +++-

arch/x86/xen/suspend.c | 2 +-

arch/x86/xen/xen-ops.h | 2 +-

drivers/xen/platform-pci.c | 15 ------

include/xen/events.h | 2 -

7 files changed, 113 insertions(+), 130 deletions(-)

Konrad Rzeszutek Wilk (3):

Revert "xen PVonHVM: move shared_info to MMIO before kexec"

xen/p2m: Reuse existing P2M leafs if they are filled with 1:1 PFNs or INVALID.

xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M.

Show more