# git rev-parse -q --verify 5bb9871eb8daa2e6a07caf7aeafbe2d0b3faad8f^{commit} 5bb9871eb8daa2e6a07caf7aeafbe2d0b3faad8f already have revision, skipping fetch # git checkout -q -f -B kisskb 5bb9871eb8daa2e6a07caf7aeafbe2d0b3faad8f # git clean -qxdf # git log -1 commit 5bb9871eb8daa2e6a07caf7aeafbe2d0b3faad8f Merge: 73056bb d045437 Author: Linus Torvalds Date: Thu Feb 25 20:12:09 2016 -0800 Merge tag 'trace-fixes-v4.5-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull tracing fix from Steven Rostedt: "Another small bug reported to me by Chunyu Hu. When perf added a "reg" function to the function tracing event (not a tracepoint), it caused that event to be displayed as a tracepoint and could cause errors in tracepoint handling. That was solved by adding a flag to ignore ftrace non-tracepoint events. But that flag was missed when displaying events in available_events, which should only contain tracepoint events. This broke a documented way to enable all events with: cat available_events > set_event As the function non-tracepoint event would cause that to error out. The commit here fixes that by having the available_events file not list events that have the ignore flag set" * tag 'trace-fixes-v4.5-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix showing function event in available_events # < /opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < git log --format=%s --max-count=1 5bb9871eb8daa2e6a07caf7aeafbe2d0b3faad8f # < make -j 240 ARCH=sh O=/home/kisskb/slave/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- randconfig KCONFIG_SEED=0x394FD390 # Added to kconfig CONFIG_STANDALONE=y # yes \n | make -j 240 ARCH=sh O=/home/kisskb/slave/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -j 240 ARCH=sh O=/home/kisskb/slave/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- make[1]: Entering directory `/home/kisskb/slave/src' make[2]: Entering directory `/home/kisskb/slave/build/linus_sh-randconfig_sh4' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig make[2]: Leaving directory `/home/kisskb/slave/build/linus_sh-randconfig_sh4' make[2]: Entering directory `/home/kisskb/slave/build/linus_sh-randconfig_sh4' /home/kisskb/slave/src/Makefile:666: Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: -fstack-protector-strong not supported by compiler CHK include/config/kernel.release GEN ./Makefile WRAP arch/sh/include/generated/asm/bitsperlong.h WRAP arch/sh/include/generated/asm/cputime.h WRAP arch/sh/include/generated/asm/current.h WRAP arch/sh/include/generated/asm/delay.h WRAP arch/sh/include/generated/asm/div64.h WRAP arch/sh/include/generated/asm/emergency-restart.h WRAP arch/sh/include/generated/asm/errno.h WRAP arch/sh/include/generated/asm/exec.h WRAP arch/sh/include/generated/asm/fcntl.h WRAP arch/sh/include/generated/asm/ioctl.h WRAP arch/sh/include/generated/asm/ipcbuf.h WRAP arch/sh/include/generated/asm/irq_regs.h WRAP arch/sh/include/generated/asm/irq_work.h WRAP arch/sh/include/generated/asm/kvm_para.h WRAP arch/sh/include/generated/asm/local.h WRAP arch/sh/include/generated/asm/local64.h WRAP arch/sh/include/generated/asm/mcs_spinlock.h WRAP arch/sh/include/generated/asm/mm-arch-hooks.h WRAP arch/sh/include/generated/asm/mman.h WRAP arch/sh/include/generated/asm/msgbuf.h WRAP arch/sh/include/generated/asm/param.h WRAP arch/sh/include/generated/asm/parport.h WRAP arch/sh/include/generated/asm/percpu.h WRAP arch/sh/include/generated/asm/poll.h WRAP arch/sh/include/generated/asm/preempt.h WRAP arch/sh/include/generated/asm/resource.h WRAP arch/sh/include/generated/asm/sembuf.h WRAP arch/sh/include/generated/asm/serial.h WRAP arch/sh/include/generated/asm/shmbuf.h WRAP arch/sh/include/generated/asm/siginfo.h WRAP arch/sh/include/generated/asm/sizes.h WRAP arch/sh/include/generated/asm/socket.h WRAP arch/sh/include/generated/asm/statfs.h WRAP arch/sh/include/generated/asm/termios.h WRAP arch/sh/include/generated/asm/termbits.h WRAP arch/sh/include/generated/asm/trace_clock.h WRAP arch/sh/include/generated/asm/ucontext.h WRAP arch/sh/include/generated/asm/xor.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h HOSTCC scripts/kallsyms HOSTCC scripts/asn1_compiler HOSTCC scripts/dtc/dtc.o HOSTCC scripts/dtc/flattree.o HOSTCC scripts/dtc/fstree.o HOSTCC scripts/genksyms/genksyms.o HOSTCC scripts/dtc/data.o CC scripts/mod/empty.o HOSTCC scripts/dtc/livetree.o SHIPPED scripts/genksyms/parse.tab.c HOSTCC scripts/mod/mk_elfconfig SHIPPED scripts/genksyms/lex.lex.c HOSTCC scripts/dtc/treesource.o SHIPPED scripts/genksyms/keywords.hash.c cc1: error: unrecognized command line option '-fstack-protector-strong' SHIPPED scripts/genksyms/parse.tab.h HOSTCC scripts/dtc/srcpos.o CC scripts/mod/devicetable-offsets.s HOSTCC scripts/dtc/checks.o HOSTCC scripts/genksyms/parse.tab.o make[4]: *** [scripts/mod/empty.o] Error 1 make[4]: *** Waiting for unfinished jobs.... SHIPPED scripts/dtc/dtc-lexer.lex.c HOSTCC scripts/genksyms/lex.lex.o HOSTCC scripts/dtc/util.o SHIPPED scripts/dtc/dtc-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.c cc1: error: unrecognized command line option '-fstack-protector-strong' make[4]: *** [scripts/mod/devicetable-offsets.s] Error 1 HOSTCC scripts/dtc/dtc-lexer.lex.o HOSTCC scripts/dtc/dtc-parser.tab.o make[3]: *** [scripts/mod] Error 2 make[3]: *** Waiting for unfinished jobs.... HOSTLD scripts/dtc/dtc HOSTLD scripts/genksyms/genksyms make[2]: *** [scripts] Error 2 make[2]: *** Waiting for unfinished jobs.... UPD include/config/kernel.release make[2]: Leaving directory `/home/kisskb/slave/build/linus_sh-randconfig_sh4' make[1]: *** [sub-make] Error 2 make[1]: Leaving directory `/home/kisskb/slave/src' Command 'make -j 240 ARCH=sh O=/home/kisskb/slave/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/linus_sh-randconfig_sh4 # Build took: 0:00:08.268716