# git rev-parse -q --verify 1fc596a56b334f4d593a2b49e5ff55af6aaa0816^{commit} 1fc596a56b334f4d593a2b49e5ff55af6aaa0816 already have revision, skipping fetch # git checkout -q -f -B kisskb 1fc596a56b334f4d593a2b49e5ff55af6aaa0816 # git clean -qxdf # < git log -1 # commit 1fc596a56b334f4d593a2b49e5ff55af6aaa0816 # Merge: 646b0de5fe32 4e84dc47bb48 # Author: Linus Torvalds # Date: Wed Oct 27 10:41:59 2021 -0700 # # Merge tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace # # Pull nds32 tracing fix from Steven Rostedt: # "Fix nds32le build when DYNAMIC_FTRACE is disabled # # A randconfig found that nds32le architecture fails to build due to a # prototype mismatch between a ftrace function pointer and the function # it was to be assigned to. That function pointer prototype missed being # updated when all the ftrace callbacks were updated" # # * tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: # ftrace/nds32: Update the proto for ftrace_trace_function to match ftrace_stub # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 1fc596a56b334f4d593a2b49e5ff55af6aaa0816 # < make -s -j 32 ARCH=x86 O=/kisskb/build/linus_x86-allmodconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=x86 O=/kisskb/build/linus_x86-allmodconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux- help # make -s -j 32 ARCH=x86 O=/kisskb/build/linus_x86-allmodconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux- olddefconfig # make -s -j 32 ARCH=x86 O=/kisskb/build/linus_x86-allmodconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/x86_64-linux/bin/x86_64-linux- Completed OK # rm -rf /kisskb/build/linus_x86-allmodconfig_x86_64-gcc11 # Build took: 0:19:31.554461