# git rev-parse -q --verify e2da783614bb8930aa89753d3c3cd53d5604665d^{commit} e2da783614bb8930aa89753d3c3cd53d5604665d already have revision, skipping fetch # git checkout -q -f -B kisskb e2da783614bb8930aa89753d3c3cd53d5604665d # git clean -qxdf # < git log -1 # commit e2da783614bb8930aa89753d3c3cd53d5604665d # Merge: a1339d6355ac 648b054a4647 # Author: Linus Torvalds # Date: Sun Jan 17 13:14:46 2021 -0800 # # Merge tag 'perf-tools-fixes-2021-01-17' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tools fixes from Arnaldo Carvalho de Melo: # # - Fix 'CPU too large' error in Intel PT # # - Correct event attribute sizes in 'perf inject' # # - Sync build_bug.h and kvm.h kernel copies # # - Fix bpf.h header include directive in 5sec.c 'perf trace' bpf example # # - libbpf tests fixes # # - Fix shadow stat 'perf test' for non-bash shells # # - Take cgroups into account for shadow stats in 'perf stat' # # * tag 'perf-tools-fixes-2021-01-17' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # perf inject: Correct event attribute sizes # perf intel-pt: Fix 'CPU too large' error # perf stat: Take cgroups into account for shadow stats # perf stat: Introduce struct runtime_stat_data # libperf tests: Fail when failing to get a tracepoint id # libperf tests: If a test fails return non-zero # libperf tests: Avoid uninitialized variable warning # perf test: Fix shadow stat test for non-bash shells # tools headers: Syncronize linux/build_bug.h with the kernel sources # tools headers UAPI: Sync kvm.h headers with the kernel sources # perf bpf examples: Fix bpf.h header include directive in 5sec.c example # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 e2da783614bb8930aa89753d3c3cd53d5604665d # < make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7724_generic_defconfig # < make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:279: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:117: scripts/mod/devicetable-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1205: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 # Build took: 0:00:03.899014