[Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging

[patchbot@xxxxxxx]

commit 1716be47617c1ef18189607448a9242e533cd6f7
Merge: 77fec3a67b6881e8203e44f8d18e9fd2c160c903 
2052a51f9749b79973cba54bd4306cad7726e763
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Feb 11 17:09:28 2016 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Feb 11 17:09:28 2016 +0000

    Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into 
staging

 tools/libxc/xc_domain.c             |  15 ++--
 xen/arch/x86/cpu/amd.c              |  12 +--
 xen/arch/x86/cpu/centaur.c          |   3 -
 xen/arch/x86/cpu/common.c           |   4 +-
 xen/arch/x86/cpu/mcheck/mce.c       |   8 +-
 xen/arch/x86/cpu/mcheck/mce_intel.c |   8 +-
 xen/arch/x86/cpu/mcheck/non-fatal.c |   2 +-
 xen/arch/x86/cpu/mcheck/x86_mca.h   |   2 +-
 xen/arch/x86/cpu/mtrr/generic.c     |   3 +-
 xen/arch/x86/cpu/mwait-idle.c       |   6 +-
 xen/arch/x86/domain_build.c         |   3 +-
 xen/arch/x86/flushtlb.c             |   8 +-
 xen/arch/x86/hvm/vmx/vmx.c          |   2 +-
 xen/arch/x86/mm/p2m-ept.c           |  28 ++++---
 xen/arch/x86/mm/p2m-pt.c            |  13 +--
 xen/arch/x86/mm/p2m.c               | 154 +++++++++++++++++++++++++++---------
 xen/arch/x86/setup.c                |  12 +--
 xen/arch/x86/traps.c                |  81 +++++++++++++++++++
 xen/common/domctl.c                 |   6 +-
 xen/common/kernel.c                 |   5 +-
 xen/common/memory.c                 |   2 +-
 xen/drivers/char/console.c          |  16 ++++
 xen/include/asm-x86/amd.h           |  22 +++---
 xen/include/asm-x86/cpufeature.h    |  18 +----
 xen/include/asm-x86/p2m.h           |   5 +-
 xen/include/asm-x86/processor.h     |   1 -
 xen/include/public/domctl.h         |   9 ++-
 xen/include/xen/console.h           |   2 +
 xen/include/xen/init.h              |   5 --
 29 files changed, 321 insertions(+), 134 deletions(-)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog