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

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

patchbot
commit 9e675671cac6c7f6ab2a7cdd193869da27e113ba
Merge: dfe280c17dbc93c267a9fdf0caa4c0abdd64cd3c 09ed69f66d5799cd70f38e458b56a6a65dbead1f
Author:     Jan Beulich <[hidden email]>
AuthorDate: Wed Aug 30 12:24:41 2017 +0200
Commit:     Jan Beulich <[hidden email]>
CommitDate: Wed Aug 30 12:24:41 2017 +0200

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

 xen/arch/x86/domain.c          |  8 ++---
 xen/arch/x86/mm.c              | 68 ++++++++++++++++++++++++------------------
 xen/arch/x86/mm/shadow/multi.c |  4 +--
 xen/arch/x86/percpu.c          | 19 +++++++++++-
 xen/arch/x86/pv/callback.c     |  6 ++++
 xen/arch/x86/pv/domain.c       |  6 ++++
 xen/arch/x86/pv/emul-gate-op.c |  6 ++++
 xen/arch/x86/pv/emul-priv-op.c | 20 ++++++++-----
 xen/arch/x86/pv/iret.c         |  6 ++++
 xen/arch/x86/pv/traps.c        |  6 ++++
 xen/arch/x86/traps.c           |  2 +-
 xen/include/asm-x86/domain.h   |  5 ++--
 xen/include/asm-x86/mm.h       |  6 ++--
 xen/include/asm-x86/page.h     |  4 +--
 14 files changed, 115 insertions(+), 51 deletions(-)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog