diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2026-05-21 14:02:29 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2026-05-21 20:42:25 -0300 |
| commit | 6c1b9c1ed6699298fdf7889874dc033f1cc5c8a7 (patch) | |
| tree | 6ab0a57a78180a9f6a81286fb5eb4378c00a5cbd /tools/perf/scripts/python/bin/stackcollapse-record | |
| parent | f8d0db39bcc536ef652968c45ca23f8f27f58997 (diff) | |
| parent | 758c807bb943138f887d42d986b645e12446ba9c (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
Fixup clash of:
552636b9317c8a84 ("perf trace: Add beautifier script for fsmount flags")
That went via Namhyung upstream and the following ones in the
perf-tools-next tree:
32969ef6e3e1979a ("perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase")
537609924c43715e ("perf trace beauty: Make beauty generated C code standalone .o files")
This complements f8d0db39bcc536ef ("perf build: Fix fsmount.o build")
sent by Ian Rogers.
Acked-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: Ian Rogers <irogers@google.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Thorsten Leemhuis <linux@leemhuis.info>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/scripts/python/bin/stackcollapse-record')
0 files changed, 0 insertions, 0 deletions