Arnaldo Carvalho de Melo 6c1b9c1ed6 Merge remote-tracking branch 'torvalds/master' into perf-tools-next ...

Fixup clash of:

  552636b931 ("perf trace: Add beautifier script for fsmount flags")

That went via Namhyung upstream and the following ones in the
perf-tools-next tree:

  32969ef6e3 ("perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase")
  537609924c ("perf trace beauty: Make beauty generated C code standalone .o files")

This complements f8d0db39bc ("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>

2026-05-21 20:42:25 -03:00

..

beauty

Merge remote-tracking branch 'torvalds/master' into perf-tools-next

2026-05-21 20:42:25 -03:00

strace/groups

perf trace: Add 'string' event alias to select syscalls with string args

2019-04-01 14:49:24 -03:00