Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Sat, 24 Mar 2018 08:21:47 +0000 (09:21 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 24 Mar 2018 08:21:47 +0000 (09:21 +0100)
commit7054e4e0b165ba74562adef96a6b1c53fb9600a4
tree4b0a313a032f0522d277ed8d8bac63d0dc2e9a94
parent5701dd1e87d5b3e72226a6cc9b83ef740b4a3dd0
parentc917e0f259908e75bd2a65877e25f9d90c22c848
Merge branch 'perf/urgent' into perf/core, to pick up fixes

With the cherry-picked perf/urgent commit merged separately we can now
merge all the fixes without conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/core.c
arch/x86/events/intel/core.c
arch/x86/events/intel/ds.c
arch/x86/events/perf_event.h
kernel/events/core.c