Merge branch 'perf/core' into auto-latest

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

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

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