]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ae951f dda7f43)
Merge branch 'stable/for-linus-3.7.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 17 Aug 2012 14:26:21 +0000 (10:26 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 17 Aug 2012 14:26:21 +0000 (10:26 -0400)
* stable/for-linus-3.7.rebased:
  xen/mmu: If the revector fails, don't attempt to revector anything else.
  xen/p2m: When revectoring deal with holes in the P2M array.
  xen/p2m: Reuse existing P2M leafs if they are filled with 1:1 PFNs or INVALID.
  Revert "xen PVonHVM: move shared_info to MMIO before kexec"
  xen/mmu: Release just the MFN list, not MFN list and part of pagetables.

1  2 
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history
arch/x86/xen/xen-ops.h patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc arch/x86/xen/xen-ops.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.