diff options
| author | Arnaldo Carvalho de Melo <[email protected]> | 2024-08-06 17:01:06 +0000 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2024-08-06 17:01:06 +0000 |
| commit | 37ce8a562a9f54d5eb4d35727e93dfb90925e349 (patch) | |
| tree | 80fce14de786b6b48cda0a14a745112b92d0aea6 /tools/perf/util/annotate.c | |
| parent | perf jevents.py: Ensure event names aren't duplicated (diff) | |
| parent | Merge tag 'platform-drivers-x86-v6.11-2' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | kernel-37ce8a562a9f54d5eb4d35727e93dfb90925e349.tar.gz kernel-37ce8a562a9f54d5eb4d35727e93dfb90925e349.zip | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick a patch that albeit being for tools/perf/ directory went thru a
different tree and ended up breaking some recent tests introduced in the
perf-tools-next tree to validate duplicate events in the JSON
performance event files.
Link: https://lore.kernel.org/lkml/ZrIqDMg7cBVhstYU@x1
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'tools/perf/util/annotate.c')
0 files changed, 0 insertions, 0 deletions