# git rev-parse -q --verify b555d191561a7f89b8d2108dff687d9bc4284e48^{commit} b555d191561a7f89b8d2108dff687d9bc4284e48 already have revision, skipping fetch # git checkout -q -f -B kisskb b555d191561a7f89b8d2108dff687d9bc4284e48 # git clean -qxdf # < git log -1 # commit b555d191561a7f89b8d2108dff687d9bc4284e48 # Merge: 56897d51886f fdd0ae72b34e # Author: Linus Torvalds # Date: Sat Feb 3 12:52:36 2024 +0000 # # Merge tag 'perf-tools-fixes-for-v6.8-1-2024-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools # # Pull perf tools fixes from Arnaldo Carvalho de Melo: # "Vendor events: # # - Intel Alderlake/Sapphire Rapids metric fixes, the CPU type # ("cpu_atom", "cpu_core") needs to be used as a prefix to be # considered on a metric formula, detected via one of the 'perf test' # entries. # # 'perf test' fixes: # # - Fix the creation of event selector lists on 'perf test' entries, by # initializing the sample ID flag, which is done by 'perf record', so # this fix affects only the tests, the common case isn't affected # # - Make 'perf list' respect debug settings (-v) to fix its 'perf test' # entry # # - Fix 'perf script' test when python support isn't enabled # # - Special case 'perf script' tests on s390, where only DWARF call # graphs are supported and only on software events # # - Make 'perf daemon' signal test less racy # # Compiler warnings/errors: # # - Remove needless malloc(0) call in 'perf top' that triggers # -Walloc-size # # - Fix calloc() argument order to address error introduced in gcc-14 # # Build: # # - Make minimal shellcheck version to v0.6.0, avoiding the build to # fail with older versions # # Sync kernel header copies: # # - stat.h to pick STATX_MNT_ID_UNIQUE # # - msr-index.h to pick IA32_MKTME_KEYID_PARTITIONING # # - drm.h to pick DRM_IOCTL_MODE_CLOSEFB # # - unistd.h to pick {list,stat}mount, # lsm_{[gs]et_self_attr,list_modules} syscall numbers # # - x86 cpufeatures to pick TDX, Zen, APIC MSR fence changes # # - x86's mem{cpy,set}_64.S used in 'perf bench' # # - Also, without tooling effects: asm-generic/unaligned.h, mount.h, # fcntl.h, kvm headers" # # * tag 'perf-tools-fixes-for-v6.8-1-2024-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools: (21 commits) # perf tools headers: update the asm-generic/unaligned.h copy with the kernel sources # tools include UAPI: Sync linux/mount.h copy with the kernel sources # perf evlist: Fix evlist__new_default() for > 1 core PMU # tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench' # tools headers x86 cpufeatures: Sync with the kernel sources to pick TDX, Zen, APIC MSR fence changes # tools headers UAPI: Sync unistd.h to pick {list,stat}mount, lsm_{[gs]et_self_attr,list_modules} syscall numbers # perf vendor events intel: Alderlake/sapphirerapids metric fixes # tools headers UAPI: Sync kvm headers with the kernel sources # perf tools: Fix calloc() arguments to address error introduced in gcc-14 # perf top: Remove needless malloc(0) call that triggers -Walloc-size # perf build: Make minimal shellcheck version to v0.6.0 # tools headers UAPI: Update tools's copy of drm.h headers to pick DRM_IOCTL_MODE_CLOSEFB # perf test shell daemon: Make signal test less racy # perf test shell script: Fix test for python being disabled # perf test: Workaround debug output in list test # perf list: Add output file option # perf list: Switch error message to pr_err() to respect debug settings (-v) # perf test: Fix 'perf script' tests on s390 # tools headers UAPI: Sync linux/fcntl.h with the kernel sources # tools arch x86: Sync the msr-index.h copy with the kernel sources to pick IA32_MKTME_KEYID_PARTITIONING # ... # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 b555d191561a7f89b8d2108dff687d9bc4284e48 # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # Added to kconfig CONFIG_SPI_STM32_QSPI=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:14165:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14169:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14171:warning: override: reassigning to symbol UML_NET_SLIP .config:14176:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/user-offsets.c:17:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes] 17 | void foo(void) | ^~~ In file included from /kisskb/src/arch/um/kernel/asm-offsets.c:1: /kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:9:6: error: no previous prototype for ‘foo’ [-Werror=missing-prototypes] 9 | void foo(void) | ^~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:116: arch/um/kernel/asm-offsets.s] Error 1 make[2]: *** [/kisskb/src/Makefile:1199: prepare0] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_um-x86_64-gcc12 # Build took: 0:00:08.937335