# git rev-parse -q --verify 9c5d00cb7b6bbc5a7965d9ab7d223b5402d1f02c^{commit} 9c5d00cb7b6bbc5a7965d9ab7d223b5402d1f02c already have revision, skipping fetch # git checkout -q -f -B kisskb 9c5d00cb7b6bbc5a7965d9ab7d223b5402d1f02c # git clean -qxdf # < git log -1 # commit 9c5d00cb7b6bbc5a7965d9ab7d223b5402d1f02c # Merge: 444ccf1b11a0 4fa008a2db48 # Author: Linus Torvalds # Date: Fri Oct 20 14:49:24 2023 -0700 # # Merge tag 'perf-tools-fixes-for-v6.6-2-2023-10-20' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools # # Pull perf tools fixes from Arnaldo Carvalho de Melo: # # - Fix regression in reading scale and unit files from sysfs for PMU # events, so that we can use that info to pretty print instead of # printing raw numbers: # # # perf stat -e power/energy-ram/,power/energy-gpu/ sleep 2 # # Performance counter stats for 'system wide': # # 1.64 Joules power/energy-ram/ # 0.20 Joules power/energy-gpu/ # # 2.001228914 seconds time elapsed # # # # grep -m1 "model name" /proc/cpuinfo # model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz # # # # - The small llvm.cpp file used to check if the llvm devel files are # present was incorrectly deleted when removing the BPF event in 'perf # trace', put it back as it is also used by tools/bpf/bpftool, that # uses llvm routines to do disassembly of BPF object files. # # - Fix use of addr_location__exit() in dlfilter__object_code(), making # sure that it is only used to pair a previous addr_location__init() # call. # # * tag 'perf-tools-fixes-for-v6.6-2-2023-10-20' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools: # tools build: Fix llvm feature detection, still used by bpftool # perf dlfilter: Add a test for object_code() # perf dlfilter: Fix use of addr_location__exit() in dlfilter__object_code() # perf pmu: Fix perf stat output with correct scale and unit # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 9c5d00cb7b6bbc5a7965d9ab7d223b5402d1f02c # make -s -j 40 ARCH=s390 O=/kisskb/build/linus_defconfig_s390x-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/s390-linux/bin/s390-linux- defconfig # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig # < make -s -j 40 ARCH=s390 O=/kisskb/build/linus_defconfig_s390x-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/s390-linux/bin/s390-linux- help # make -s -j 40 ARCH=s390 O=/kisskb/build/linus_defconfig_s390x-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/s390-linux/bin/s390-linux- olddefconfig .config:3704:warning: override: reassigning to symbol DEBUG_INFO_BTF # make -s -j 40 ARCH=s390 O=/kisskb/build/linus_defconfig_s390x-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/s390-linux/bin/s390-linux- Completed OK # rm -rf /kisskb/build/linus_defconfig_s390x-gcc12 # Build took: 0:02:55.188580