Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel...

Conflicts:
	kernel/trace/trace_hw_branches.c

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

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

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

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_hw_branches.c
index ca4bbcfb9e2c748fb3a0321a37da241b79a1879f,549238a9b13323fb0a86d5166ea2354ab101bb09..e3e7db61c0672bfe1a19ca0867ea945f0b3dca87
--- 1/kernel/trace/trace_hw_branches.c
--- 2/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@@ -193,10 -193,11 +193,11 @@@ void trace_hw_branch(u64 from, u64 to
        if (!event)
                goto out;
        entry   = ring_buffer_event_data(event);
-       entry->ent.cpu = cpu;
+       tracing_generic_entry_update(&entry->ent, 0, from);
+       entry->ent.type = TRACE_HW_BRANCHES;
        entry->from = from;
        entry->to   = to;
 -      ring_buffer_unlock_commit(tr->buffer, event, irq2);
 +      trace_buffer_unlock_commit(tr, event, 0, 0);
  
   out:
        atomic_dec(&tr->data[cpu]->disabled);

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