# git rev-parse -q --verify cd796ed3345030aa1bb332fe5c793b3dddaf56e7^{commit} cd796ed3345030aa1bb332fe5c793b3dddaf56e7 already have revision, skipping fetch # git checkout -q -f -B kisskb cd796ed3345030aa1bb332fe5c793b3dddaf56e7 # git clean -qxdf # < git log -1 # commit cd796ed3345030aa1bb332fe5c793b3dddaf56e7 # Merge: 0477e9288185 bcee52789588 # Author: Linus Torvalds # Date: Mon Dec 7 11:20:26 2020 -0800 # # Merge tag 'trace-v5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace # # Pull tracing fix from Steven Rostedt: # "Fix userstacktrace option for instances # # While writing an application that requires user stack trace option to # work in instances, I found that the instance option has a bug that # makes it a nop. The check for performing the user stack trace in an # instance, checks the top level options (not the instance options) to # determine if a user stack trace should be performed or not. # # This is not only incorrect, but also confusing for users. It confused # me for a bit!" # # * tag 'trace-v5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: # tracing: Fix userstacktrace option for instances # < /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 cd796ed3345030aa1bb332fe5c793b3dddaf56e7 # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_magicpanelr2_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- magicpanelr2_defconfig # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_magicpanelr2_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 48 ARCH=sh O=/kisskb/build/linus_magicpanelr2_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 48 ARCH=sh O=/kisskb/build/linus_magicpanelr2_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 :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: kernel/sched/core.o: uses dsp instructions while previous modules use floating point instructions /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: kernel/sched/core.o: uses instructions which are incompatible with instructions used in previous modules /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: failed to merge target specific data of file kernel/sched/core.o make[1]: *** [/kisskb/src/Makefile:1170: vmlinux] Error 1 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=sh O=/kisskb/build/linus_magicpanelr2_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_magicpanelr2_defconfig_sh4-gcc4.9 # Build took: 0:00:56.496414