Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes and move perf/core forward, minor conflict as
perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a
'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/
specific, it is not in libperf.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --cc tools/lib/traceevent/kbuffer.h
Simple merge

diff --cc tools/perf/builtin-record.c
index 19b1d5effb7a74e21490887e4bbc59877d353870,a37e7910e9e90bf8c6bf5edd00b42e78a7593d66..bf1f18366726e4272bffb8980cd3ea8cf1e591ae
--- 1/tools/perf/builtin-record.c
--- 2/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@@ -852,15 -852,15 +852,15 @@@ static int record__open(struct record *
         * event synthesis.
         */
        if (opts->initial_delay || target__has_cpu(&opts->target)) {
-               if (evlist__add_dummy(evlist))
-                       return -ENOMEM;
- 
-               /* Disable tracking of mmaps on lead event. */
-               pos = evlist__first(evlist);
-               pos->tracking = 0;
-               /* Set up dummy event. */
-               pos = evlist__last(evlist);
-               pos->tracking = 1;
+               pos = perf_evlist__get_tracking_event(evlist);
+               if (!evsel__is_dummy_event(pos)) {
+                       /* Set up dummy event. */
 -                      if (perf_evlist__add_dummy(evlist))
++                      if (evlist__add_dummy(evlist))
+                               return -ENOMEM;
+                       pos = evlist__last(evlist);
+                       perf_evlist__set_tracking_event(evlist, pos);
+               }
+ 
                /*
                 * Enable the dummy event when the process is forked for
                 * initial_delay, immediately for system wide.

diff --cc tools/perf/builtin-script.c
Simple merge

diff --cc tools/perf/util/evlist.c
Simple merge

diff --cc tools/perf/util/evlist.h
Simple merge