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>