diff options
| author | Ingo Molnar <[email protected]> | 2018-05-10 18:09:00 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2018-05-10 18:09:00 +0000 |
| commit | 49cf4a4b3f5a8b02556dd4f45c5cee598d4fc799 (patch) | |
| tree | f86cd69898bf9f2bcb640a292879e8e06057e757 /fs/proc/array.c | |
| parent | Linux 4.17-rc4 (diff) | |
| parent | Revert "perf pmu: Fix pmu events parsing rule" (diff) | |
| download | kernel-49cf4a4b3f5a8b02556dd4f45c5cee598d4fc799.tar.gz kernel-49cf4a4b3f5a8b02556dd4f45c5cee598d4fc799.zip | |
Merge tag 'perf-urgent-for-mingo-4.17-20180507' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
. Revert "perf pmu: Fix pmu events parsing rule", as it broke Intel PT
event description parsing (Arnaldo Carvalho de Melo)
. Sync x86's cpufeatures.h and kvm UAPI headers with the kernel sources,
suppressing the ABI drift warnings (Arnaldo Carvalho de Melo)
- Remove duplicated entry for westmereep-dp in Intel's mapfile.csv (William Cohen)
- Fix typo in 'perf bench numa' options description (Yisheng Xie)
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions