Merge branch 'linus' into perf/core

Pick up the latest ring-buffer fixes, before applying a new fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

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

diff --cc tools/perf/util/trace-event-parse.c
index a51bd86,5dd3b5e..0715c84
--- 1/tools/perf/util/trace-event-parse.c
--- 2/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@@ -188,13 -198,12 +188,12 @@@ void print_trace_event(struct pevent *p
        record.data = data;
  
        trace_seq_init(&s);
-       pevent_print_event(pevent, &s, &record);
+       pevent_event_info(&s, event, &record);
        trace_seq_do_printf(&s);
-       printf("\n");
  }
  
 -void print_event(int cpu, void *data, int size, unsigned long long nsecs,
 -                char *comm)
 +void print_event(struct pevent *pevent, int cpu, void *data, int size,
 +               unsigned long long nsecs, char *comm)
  {
        struct pevent_record record;
        struct trace_seq s;