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

[patchbot@xxxxxxx]

commit 8747dba3b7218b6e21999fbfdff9d4f807650269
Merge: 16181cbb107ea70a72f41982b371c444926f48f2 
076cd50657516fd265107101b0a8385e487fc304
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Sep 2 14:27:01 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Sep 2 14:27:01 2015 +0100

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

 tools/libxc/include/xenctrl.h          |    8 +-
 tools/libxc/xc_tmem.c                  |  123 ++++-----
 tools/libxl/libxl.c                    |   22 +-
 tools/python/xen/lowlevel/xc/xc.c      |   27 +-
 tools/xenstat/libxenstat/src/xenstat.c |    6 +-
 xen/common/compat/tmem_xen.c           |    4 +-
 xen/common/sysctl.c                    |    7 +-
 xen/common/tmem.c                      |  477 +++++++++++++++++---------------
 xen/include/public/sysctl.h            |   56 ++++
 xen/include/public/tmem.h              |   58 +---
 xen/include/xen/tmem.h                 |    3 +
 xen/include/xen/tmem_xen.h             |    4 -
 xen/include/xlat.lst                   |    1 +
 xen/include/xsm/dummy.h                |    6 -
 xen/include/xsm/xsm.h                  |    6 -
 xen/xsm/dummy.c                        |    1 -
 xen/xsm/flask/hooks.c                  |    9 +-
 xen/xsm/flask/policy/access_vectors    |    2 +-
 18 files changed, 425 insertions(+), 395 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