Merge branch 'perf/urgent' into perf/core

Eliminate a conflict in a patch I am going to apply.

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