diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:21:14 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:21:14 +0100 |
commit | 5701dd1e87d5b3e72226a6cc9b83ef740b4a3dd0 (patch) | |
tree | b35db1791ac7acaba54eb3aa9f751790b735428d /kernel/events | |
parent | Merge tag 'perf-core-for-mingo-4.17-20180319' of git://git.kernel.org/pub/scm... (diff) | |
parent | perf/x86/intel: Disable userspace RDPMC usage for large PEBS (diff) | |
download | linux-5701dd1e87d5b3e72226a6cc9b83ef740b4a3dd0.tar.xz linux-5701dd1e87d5b3e72226a6cc9b83ef740b4a3dd0.zip |
Merge branch 'perf/urgent' into perf/core, to resolve conflicts
Pick up a cherry-picked commit.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
0 files changed, 0 insertions, 0 deletions