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

[patchbot@xxxxxxx]

commit 700772bc13a3d4e7a61cea166893c0f53b251f08
Merge: 8d05834df2612b8dfce93a0afd7425971c30143b 
32b31c17da1ba0da970cd182a8865ac20fabd0fa
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Nov 4 09:38:51 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Nov 4 09:38:51 2015 +0000

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

 xen/Rules.mk                             |   11 ++-
 xen/arch/arm/Makefile                    |    6 +-
 xen/arch/x86/Makefile                    |   20 +++--
 xen/arch/x86/boot/x86_64.S               |    2 +-
 xen/arch/x86/cpu/common.c                |    7 +-
 xen/arch/x86/hvm/vmx/entry.S             |   11 ++-
 xen/arch/x86/hvm/vmx/vmcs.c              |   15 +---
 xen/arch/x86/mm/hap/hap.c                |    6 +-
 xen/arch/x86/x86_64/Makefile             |    4 -
 xen/arch/x86/x86_64/compat.c             |    3 +-
 xen/arch/x86/x86_64/entry.S              |    4 +-
 xen/arch/x86/x86_64/mm.c                 |    3 +-
 xen/arch/x86/x86_64/physdev.c            |    3 +-
 xen/arch/x86/x86_64/platform_hypercall.c |    3 +-
 xen/common/Makefile                      |    2 +-
 xen/common/compat/Makefile               |    6 --
 xen/common/compat/domain.c               |    3 +-
 xen/common/compat/kernel.c               |    3 +-
 xen/common/compat/memory.c               |    3 +-
 xen/common/compat/multicall.c            |    3 +-
 xen/common/schedule.c                    |    4 +-
 xen/include/Makefile                     |    2 +-
 xen/include/asm-x86/asm_defns.h          |    2 +-
 xen/include/asm-x86/bug.h                |   37 +++++----
 xen/include/asm-x86/hvm/vmx/vmx.h        |   70 +++++++++-------
 xen/tools/symbols.c                      |  129 +++++++++++++++++++++++++++---
 26 files changed, 242 insertions(+), 120 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