]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 21 May 2026 17:02:29 +0000 (14:02 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 21 May 2026 23:42:25 +0000 (20:42 -0300)
commit6c1b9c1ed6699298fdf7889874dc033f1cc5c8a7
tree6ab0a57a78180a9f6a81286fb5eb4378c00a5cbd
parentf8d0db39bcc536ef652968c45ca23f8f27f58997
parent758c807bb943138f887d42d986b645e12446ba9c
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>
tools/perf/Makefile.perf
tools/perf/builtin-trace.c
tools/perf/trace/beauty/beauty.h