# git rev-parse -q --verify a90f1cd105c6c5c246f07ca371d873d35b78c7d9^{commit} a90f1cd105c6c5c246f07ca371d873d35b78c7d9 already have revision, skipping fetch # git checkout -q -f -B kisskb a90f1cd105c6c5c246f07ca371d873d35b78c7d9 # git clean -qxdf # < git log -1 # commit a90f1cd105c6c5c246f07ca371d873d35b78c7d9 # Merge: a76056285f5d 256d218ec6ae # Author: Linus Torvalds # Date: Sun May 19 12:33:28 2024 -0700 # # Merge tag 'turbostat-for-Linux-6.10-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux # # Pull turbostat updates from Len Brown: # # - Survive sparse die id's seen in Linux-6.9 # # - Handle clustered-uncore topology in new/upcoming hardware # # - For non-root use, add ability to see software C-state counters # # - Enable reading core and package hardware cstate via perf, and prefer # perf over the MSR driver access for these counters # # * tag 'turbostat-for-Linux-6.10-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: # tools/power turbostat: version 2024.05.10 # tools/power turbostat: Ignore pkg_cstate_limit when it is not available # tools/power turbostat: Fix order of strings in pkg_cstate_limit_strings # tools/power turbostat: Read Package-cstates via perf # tools/power turbostat: Read Core-cstates via perf # tools/power turbostat: Avoid possible memory corruption due to sparse topology IDs # tools/power turbostat: Add columns for clustered uncore frequency # tools/power turbostat: Enable non-privileged users to read sysfs counters # tools/power turbostat: Replace _Static_assert with BUILD_BUG_ON # tools/power turbostat: Add ARL-H support # tools/power turbostat: Enhance ARL/LNL support # tools/power turbostat: Survive sparse die_id # tools/power turbostat: Remember global max_die_id # tools/power turbostat: Harden probe_intel_uncore_frequency() # tools/power turbostat: Add "snapshot:" Makefile target # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/xtensa-linux/bin/xtensa-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/xtensa-linux/bin/xtensa-linux-ld --version # < git log --format=%s --max-count=1 a90f1cd105c6c5c246f07ca371d873d35b78c7d9 # make -s -j 160 ARCH=xtensa O=/kisskb/build/linus_allmodconfig_xtensa-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/xtensa-linux/bin/xtensa-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 160 ARCH=xtensa O=/kisskb/build/linus_allmodconfig_xtensa-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/xtensa-linux/bin/xtensa-linux- help # make -s -j 160 ARCH=xtensa O=/kisskb/build/linus_allmodconfig_xtensa-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/xtensa-linux/bin/xtensa-linux- olddefconfig # make -s -j 160 ARCH=xtensa O=/kisskb/build/linus_allmodconfig_xtensa-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/xtensa-linux/bin/xtensa-linux- In file included from /kisskb/src/include/asm-generic/bug.h:22, from ./arch/xtensa/include/generated/asm/bug.h:1, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/alloc_tag.h:8, from /kisskb/src/include/linux/vmalloc.h:5, from /kisskb/src/drivers/scsi/mpi3mr/mpi3mr_transport.c:10: /kisskb/src/drivers/scsi/mpi3mr/mpi3mr_transport.c: In function 'mpi3mr_sas_port_add': /kisskb/src/include/linux/kern_levels.h:5:25: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'unsigned int' [-Werror=format=] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~ /kisskb/src/include/linux/printk.h:429:25: note: in definition of macro 'printk_index_wrap' 429 | _p_func(_fmt, ##__VA_ARGS__); \ | ^~~~ /kisskb/src/include/linux/printk.h:510:9: note: in expansion of macro 'printk' 510 | printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) | ^~~~~~ /kisskb/src/include/linux/kern_levels.h:12:25: note: in expansion of macro 'KERN_SOH' 12 | #define KERN_WARNING KERN_SOH "4" /* warning conditions */ | ^~~~~~~~ /kisskb/src/include/linux/printk.h:510:16: note: in expansion of macro 'KERN_WARNING' 510 | printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~~~~~~ /kisskb/src/drivers/scsi/mpi3mr/mpi3mr_debug.h:46:9: note: in expansion of macro 'pr_warn' 46 | pr_warn("%s: " fmt, (ioc)->name, ##__VA_ARGS__) | ^~~~~~~ /kisskb/src/drivers/scsi/mpi3mr/mpi3mr_transport.c:1367:25: note: in expansion of macro 'ioc_warn' 1367 | ioc_warn(mrioc, "skipping port %u, max allowed value is %lu\n", | ^~~~~~~~ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/scsi/mpi3mr/mpi3mr_transport.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/scsi/mpi3mr] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/scsi] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1929: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 160 ARCH=xtensa O=/kisskb/build/linus_allmodconfig_xtensa-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/xtensa-linux/bin/xtensa-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_xtensa-gcc13 # Build took: 0:08:52.508682