# git rev-parse -q --verify e172f1e9068807a336c0429b6c57d29bded8d891^{commit} e172f1e9068807a336c0429b6c57d29bded8d891 already have revision, skipping fetch # git checkout -q -f -B kisskb e172f1e9068807a336c0429b6c57d29bded8d891 # git clean -qxdf # < git log -1 # commit e172f1e9068807a336c0429b6c57d29bded8d891 # Merge: e62f81bbd24d 866d2d36b81d # Author: Linus Torvalds # Date: Sun Jul 28 10:52:15 2024 -0700 # # Merge tag 'v6.11-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux # # Pull turbostat updates from Len Brown: # # - Enable turbostat extensions to add both perf and PMT (Intel # Platform Monitoring Technology) counters via the cmdline # # - Demonstrate PMT access with built-in support for Meteor Lake's # Die C6 counter # # * tag 'v6.11-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: # tools/power turbostat: version 2024.07.26 # tools/power turbostat: Include umask=%x in perf counter's config # tools/power turbostat: Document PMT in turbostat.8 # tools/power turbostat: Add MTL's PMT DC6 builtin counter # tools/power turbostat: Add early support for PMT counters # tools/power turbostat: Add selftests for added perf counters # tools/power turbostat: Add selftests for SMI, APERF and MPERF counters # tools/power turbostat: Move verbose counter messages to level 2 # tools/power turbostat: Move debug prints from stdout to stderr # tools/power turbostat: Fix typo in turbostat.8 # tools/power turbostat: Add perf added counter example to turbostat.8 # tools/power turbostat: Fix formatting in turbostat.8 # tools/power turbostat: Extend --add option with perf counters # tools/power turbostat: Group SMI counter with APERF and MPERF # tools/power turbostat: Add ZERO_ARRAY for zero initializing builtin array # tools/power turbostat: Replace enum rapl_source and cstate_source with counter_source # tools/power turbostat: Remove anonymous union from rapl_counter_info_t # tools/power/turbostat: Switch to new Intel CPU model defines # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 e172f1e9068807a336c0429b6c57d29bded8d891 # make -s -j 160 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- ip22_defconfig # < make -s -j 160 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 160 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- olddefconfig # make -s -j 160 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/sgi-ip22/ip22-gio.c:384:14: error: initialization of 'int (*)(struct device *, const struct device_driver *)' from incompatible pointer type 'int (*)(struct device *, struct device_driver *)' [-Werror=incompatible-pointer-types] .match = gio_bus_match, ^~~~~~~~~~~~~ /kisskb/src/arch/mips/sgi-ip22/ip22-gio.c:384:14: note: (near initialization for 'gio_bus_type.match') cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/mips/sgi-ip22/ip22-gio.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/mips/sgi-ip22] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/mips] Error 2 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/scsi/sgiwd93.c:173:6: warning: no previous prototype for 'sgiwd93_reset' [-Wmissing-prototypes] void sgiwd93_reset(unsigned long base) ^~~~~~~~~~~~~ make[2]: *** [/kisskb/src/Makefile:1925: .] Error 2 make[1]: *** [/kisskb/src/Makefile:224: __sub-make] Error 2 make: *** [Makefile:224: __sub-make] Error 2 Command 'make -s -j 160 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_ip22_defconfig_mips-gcc8 # Build took: 0:00:52.722079