Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

Conflicts:
	tools/perf/builtin-top.c

Semantic conflict:
	util/include/linux/list.h        # fix prefetch.h removal fallout

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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

diff --cc tools/perf/builtin-top.c
index ebfc7cf5f63bd94256165ed1d5b2a5f2e1c25ee0,74f533cbf6cafbaed250dc94801156a419f17398..2d7934e9de380da65b3c5f8e3a9ad5684d1af1a6
--- 1/tools/perf/builtin-top.c
--- 2/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@@ -805,9 -805,14 +805,14 @@@ static void perf_session__mmap_read_idx
  {
        struct perf_sample sample;
        union perf_event *event;
+       int ret;
  
 -      while ((event = perf_evlist__read_on_cpu(top.evlist, cpu)) != NULL) {
 +      while ((event = perf_evlist__mmap_read(top.evlist, idx)) != NULL) {
-               perf_session__parse_sample(self, event, &sample);
+               ret = perf_session__parse_sample(self, event, &sample);
+               if (ret) {
+                       pr_err("Can't parse sample, err = %d\n", ret);
+                       continue;
+               }
  
                if (event->header.type == PERF_RECORD_SAMPLE)
                        perf_event__process_sample(event, &sample, self);

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

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

diff --cc tools/perf/util/include/linux/list.h
index 356c7e467b83fd59af5cd191a577197ee88349b8,356c7e467b83fd59af5cd191a577197ee88349b8..ed33609b9e339738764c684d4baa13e120306702
--- 1/tools/perf/util/include/linux/list.h
--- 2/tools/perf/util/include/linux/list.h
+++ b/tools/perf/util/include/linux/list.h
@@@ -1,4 -1,4 +1,6 @@@
  #include <linux/kernel.h>
++#include <linux/prefetch.h>
++
  #include "../../../../include/linux/list.h"
  
  #ifndef PERF_LIST_H

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