# git rev-parse -q --verify ba9c77919045943af677c03f04c778a1c16ae680^{commit} ba9c77919045943af677c03f04c778a1c16ae680 already have revision, skipping fetch # git checkout -q -f -B kisskb ba9c77919045943af677c03f04c778a1c16ae680 # git clean -qxdf # < git log -1 # commit ba9c77919045943af677c03f04c778a1c16ae680 # Merge: 0eb392ec095e de7839ee02c6 # Author: Linus Torvalds # Date: Fri Mar 17 10:51:14 2023 -0700 # # Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux # # Pull turbostat fweaks and fixes from Len Brown: # "Leprechaun sized fixes and tweaks touching only turbostat. # # 'Keeping happy users happy since 2010'" # # * 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: # tools/power turbostat: version 2023.03.17 # tools/power turbostat: fix decoding of HWP_STATUS # tools/power turbostat: Introduce support for EMR # tools/power turbostat: remove stray newlines from warn/warnx strings # tools/power turbostat: Fix /dev/cpu_dma_latency warnings # tools/power turbostat: Provide better debug messages for failed capabilities accesses # tools/power turbostat: update dump of SECONDARY_TURBO_RATIO_LIMIT # < /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 ba9c77919045943af677c03f04c778a1c16ae680 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-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 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-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_um-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:12728:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:12732:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12734:warning: override: reassigning to symbol UML_NET_SLIP .config:12739:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-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/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2157:48: error: 'struct cpuinfo_um' has no member named 'apicid' 2157 | return cpu_data(first_cpu_of_numa_node).apicid; | ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2161:1: error: control reaches end of non-void function [-Werror=return-type] 2161 | } | ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/gpu/drm/amd/amdgpu] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/gpu/drm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/gpu] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:494: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:2028: .] Error 2 make: *** [Makefile:226: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-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_um-allmodconfig_um-x86_64-gcc12 # Build took: 0:14:51.577331