Merge branch 'perf/urgent' into perf/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Sat, 24 Mar 2018 08:21:14 +0000 (09:21 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 24 Mar 2018 08:21:14 +0000 (09:21 +0100)
Pick up a cherry-picked commit.

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

Trivial merge