Merge branch 'perf/urgent' into perf/core to pick up fixes before pulling new changes

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

diff --cc tools/lib/traceevent/event-parse.c
Simple merge

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