Merge branch 'perf/urgent' into perf/core, to resolve conflicts

Pick up a cherry-picked commit.

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