Merge branch 'master' into benchmark

diff --cc ltt-sessiond/Makefile.am
index c9bdee434231458d9382c304771e5b1315aa488a,80c6b81e287a3135aea47cddab3029f392b866e3..93af21fa30eb84d5e9dd70661c34dd7ce4283da3
--- 1/ltt-sessiond/Makefile.am
--- 2/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@@ -1,6 -1,5 +1,5 @@@
 -AM_CPPFLAGS = -I$(top_srcdir)/include \
 -                        -DINSTALL_BIN_PATH=\""$(bindir)"\"
 +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/benchmark \
-                         -I$(top_srcdir)/libkernelctl -I$(top_srcdir)/libustctl \
 +                        -DINSTALL_BIN_PATH=\"$(bindir)\"
  
  AM_CFLAGS = -fno-strict-aliasing
  

diff --cc ltt-sessiond/main.c
index 8d9cfdfbcf31535aa2ee8b7127471fef07247116,dd9f221de58b9d53c111f2729d50c9317af00e2d..78682f3a4eeeb27d318e5ad931b1c0f79b8e4bc6
--- 1/ltt-sessiond/main.c
--- 2/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@@ -35,27 -34,20 +34,22 @@@
  #include <sys/socket.h>
  #include <sys/stat.h>
  #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/resource.h>
  #include <unistd.h>
  
- #include <urcu/list.h>                /* URCU list library (-lurcu) */
- #include <lttng/lttng.h>
- #include <lttng/lttng-kconsumerd.h>
+ #include <ltt-kconsumerd.h>
  #include <lttng-sessiond-comm.h>
+ #include <lttng/lttng-kconsumerd.h>
+ #include <lttngerr.h>
  
  #include "context.h"
- #include "ltt-sessiond.h"
- #include "lttngerr.h"
  #include "kernel-ctl.h"
- #include "ust-ctl.h"
- #include "session.h"
+ #include "ltt-sessiond.h"
  #include "traceable-app.h"
- #include "ltt-kconsumerd.h"
+ #include "ust-ctl.h"
  #include "utils.h"
  
 +#include "benchmark.h"
 +
  /* Const values */
  const char default_home_dir[] = DEFAULT_HOME_DIR;
  const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP;