From: Arnaldo Carvalho de Melo Date: Tue, 19 Dec 2023 00:37:07 +0000 (-0300) Subject: Merge remote-tracking branch 'torvalds/master' into perf-tools-next X-Git-Tag: v6.8-rc1~14^2~51 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ab1c247094e323177a578b38f0325bf79f0317ac;p=linux-2.6-block.git Merge remote-tracking branch 'torvalds/master' into perf-tools-next To pick up fixes that went thru perf-tools for v6.7 and to get in sync with upstream to check for drift in the copies of headers, etc. Signed-off-by: Arnaldo Carvalho de Melo --- ab1c247094e323177a578b38f0325bf79f0317ac diff --cc tools/perf/Makefile.perf index 1ab2a908f240,058c9aecf608..27e7c478880f --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@@ -1142,9 -1150,9 +1159,9 @@@ endif # CONFIG_PERF_BPF_SKE bpf-skel-clean: $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS) - clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean + clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS) - $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete + $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete -o -name '*.shellcheck_log' -delete $(Q)$(RM) $(OUTPUT).config-detected $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \