# git rev-parse -q --verify 705d43dbe10d6e213a75187ac92b61f9bd00af0b^{commit} 705d43dbe10d6e213a75187ac92b61f9bd00af0b already have revision, skipping fetch # git checkout -q -f -B kisskb 705d43dbe10d6e213a75187ac92b61f9bd00af0b # git clean -qxdf # git log -1 commit 705d43dbe10d6e213a75187ac92b61f9bd00af0b Merge: dd8fc10 7dcd182 Author: Linus Torvalds Date: Thu Feb 18 16:34:15 2016 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching Pull livepatching fixes from Jiri Kosina: - regression (from 4.4) fix for ordering issue, introduced by an earlier ftrace change, that broke live patching of modules. The fix replaces the ftrace module notifier by direct call in order to make the ordering guaranteed and well-defined. The patch, from Jessica Yu, has been acked both by Steven and Rusty - error message fix from Miroslav Benes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: ftrace/module: remove ftrace module notifier livepatch: change the error message in asm/livepatch.h header files # < /opt/cross/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < git log --format=%s --max-count=1 705d43dbe10d6e213a75187ac92b61f9bd00af0b # < make -j 48 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=0x28495776 # Added to kconfig CONFIG_STANDALONE=y # yes \n | make -j 48 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 48 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/build/linus_sh-randconfig_sh4' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig /home/kisskb/slave/src/Makefile:666: Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: -fstack-protector-strong not supported by compiler CHK include/config/kernel.release UPD 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/termbits.h WRAP arch/sh/include/generated/asm/termios.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 CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/basic/bin2c Using /home/kisskb/slave/src as source for kernel HOSTCC scripts/asn1_compiler HOSTCC scripts/extract-cert HOSTCC scripts/kallsyms HOSTCC scripts/sign-file HOSTCC scripts/genksyms/genksyms.o SHIPPED scripts/genksyms/parse.tab.c SHIPPED scripts/genksyms/lex.lex.c SHIPPED scripts/genksyms/keywords.hash.c SHIPPED scripts/genksyms/parse.tab.h HOSTCC scripts/genksyms/parse.tab.o CC scripts/mod/empty.o HOSTCC scripts/genksyms/lex.lex.o HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s HOSTCC scripts/selinux/genheaders/genheaders cc1: error: unrecognized command line option '-fstack-protector-strong' HOSTCC scripts/selinux/mdp/mdp cc1: error: unrecognized command line option '-fstack-protector-strong' /home/kisskb/slave/src/scripts/Makefile.build:153: recipe for target 'scripts/mod/devicetable-offsets.s' failed make[3]: *** [scripts/mod/devicetable-offsets.s] Error 1 make[3]: *** Waiting for unfinished jobs.... /home/kisskb/slave/src/scripts/Makefile.build:258: recipe for target 'scripts/mod/empty.o' failed make[3]: *** [scripts/mod/empty.o] Error 1 /home/kisskb/slave/src/scripts/Makefile.build:407: recipe for target 'scripts/mod' failed make[2]: *** [scripts/mod] Error 2 make[2]: *** Waiting for unfinished jobs.... Generating include/generated/machtypes.h CHK include/generated/timeconst.h CC kernel/bounds.s UPD include/generated/timeconst.h cc1: error: unrecognized command line option '-fstack-protector-strong' /home/kisskb/slave/src/./Kbuild:44: recipe for target 'kernel/bounds.s' failed make[2]: *** [kernel/bounds.s] Error 1 make[2]: *** Waiting for unfinished jobs.... /home/kisskb/slave/src/Makefile:993: recipe for target 'prepare0' failed make[1]: *** [prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... HOSTLD scripts/genksyms/genksyms /home/kisskb/slave/src/Makefile:551: recipe for target 'scripts' failed make[1]: *** [scripts] Error 2 make[1]: Leaving directory '/home/kisskb/slave/build/linus_sh-randconfig_sh4' Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 48 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:04.888854