Merge branch 'perf/urgent' into perf/core, to pick up fixes

Browse source

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>

...

This commit is contained in:

Ingo Molnar 2018-03-24 09:21:47 +01:00

parent 5701dd1e87 c917e0f259

commit 7054e4e0b1

6 changed files with 48 additions and 33 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/events/core.c

View file

14

arch/x86/events/intel/core.c

View file

6

arch/x86/events/intel/ds.c

View file

32

arch/x86/events/intel/uncore_snbep.c

View file

6

arch/x86/events/perf_event.h

View file

21

kernel/events/core.c

View file