]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit547ba0bff07e8a9e61acb261e01295512efff01c
tree4b0a313a032f0522d277ed8d8bac63d0dc2e9a94
parentebb3b7018989aee90364a0583117fd8b6be99fcc
parent7b82e29c982be986c4a715b731afc11e3086b5d4
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