Skip to contentSkip to conversation

(xen) stable/for-linus-3.6-rc6-tag.

GIT PULL Konrad Rzeszutek Wilk 1 participant 1 message Sep 21, 2012

lore
Share & tools
lore
#0 lore raw

Hey Linus,

Please git pull the following two bug-fixes from:

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

which has two bug-fixes. One is a bootup that we had ignored until we found that on DL380 G6 it was needed. The other is more recent - in v3.5 we added batching for M2P override (Machine Frame Number -> Physical Frame Number), but the original MFN was saved in an incorrect structure - and we would oops/restore when restoring with the old MFN. Both of them CC the stable train. Please pull!

Konrad Rzeszutek Wilk (1):
xen/boot: Disable BIOS SMP MP table search.

Stefano Stabellini (1):

      xen/m2p: do not reuse kmap_op->dev_bus_addr

arch/x86/include/asm/xen/page.h | 3 ++-

 arch/x86/xen/enlighten.c            |    4 ++++
 arch/x86/xen/p2m.c                  |   27 +++++++++++----------------
 drivers/block/xen-blkback/blkback.c |    2 +-
 drivers/xen/gntdev.c                |    5 +++--
 drivers/xen/grant-table.c           |    6 ++++--
 include/xen/grant_table.h           |    3 ++-
 7 files changed, 27 insertions(+), 23 deletions(-)