# git rev-parse -q --verify 29f1bf34ed38222372365657b9498af2e3f8c208^{commit} 29f1bf34ed38222372365657b9498af2e3f8c208 already have revision, skipping fetch # git checkout -q -f -B kisskb 29f1bf34ed38222372365657b9498af2e3f8c208 # git clean -qxdf # git log -1 commit 29f1bf34ed38222372365657b9498af2e3f8c208 Merge: 5952cc7 1ecb4ae Author: Linus Torvalds Date: Fri Feb 12 13:12:27 2016 -0800 Merge branch 'akpm'(patches from Andrew) Merge fixes from Andrew Morton: "10 fixes" The lockdep hlist conversion is in the locking tree too, waiting for the next merge window. Andrew thought it should go in now. I'll take it, since it fixes a real problem and looks trivially correct (famous last words). * emailed patches from Andrew Morton : arch/x86/Kconfig: CONFIG_X86_UV should depend on CONFIG_EFI mm: fix pfn_t vs highmem kernel/locking/lockdep.c: convert hash tables to hlists mm,thp: fix spellos in describing __HAVE_ARCH_FLUSH_PMD_TLB_RANGE mm,thp: khugepaged: call pte flush at the time of collapse mm/backing-dev.c: fix error path in wb_init() mm, dax: check for pmd_none() after split_huge_pmd() vsprintf: kptr_restrict is okay in IRQ when 2 mm: fix filemap.c kernel doc warning ubsan: cosmetic fix to Kconfig text # < /opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc --version # < git log --format=%s --max-count=1 29f1bf34ed38222372365657b9498af2e3f8c208 # < make -j 48 ARCH=arm O=/home/kisskb/slave/build/linus_arm-randconfig_arm CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- randconfig KCONFIG_SEED=0x75A041F4 # make -j 48 ARCH=arm O=/home/kisskb/slave/build/linus_arm-randconfig_arm CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- make[1]: Entering directory '/home/kisskb/slave/build/linus_arm-randconfig_arm' 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 GEN ./Makefile WRAP arch/arm/include/generated/asm/bitsperlong.h WRAP arch/arm/include/generated/asm/cputime.h WRAP arch/arm/include/generated/asm/current.h WRAP arch/arm/include/generated/asm/early_ioremap.h WRAP arch/arm/include/generated/asm/emergency-restart.h WRAP arch/arm/include/generated/asm/errno.h WRAP arch/arm/include/generated/asm/exec.h WRAP arch/arm/include/generated/asm/ioctl.h WRAP arch/arm/include/generated/asm/ipcbuf.h WRAP arch/arm/include/generated/asm/irq_regs.h WRAP arch/arm/include/generated/asm/kdebug.h WRAP arch/arm/include/generated/asm/local.h WRAP arch/arm/include/generated/asm/local64.h CHK include/generated/uapi/linux/version.h WRAP arch/arm/include/generated/asm/mm-arch-hooks.h WRAP arch/arm/include/generated/asm/msgbuf.h WRAP arch/arm/include/generated/asm/msi.h WRAP arch/arm/include/generated/asm/param.h UPD include/generated/uapi/linux/version.h WRAP arch/arm/include/generated/asm/parport.h WRAP arch/arm/include/generated/asm/poll.h WRAP arch/arm/include/generated/asm/preempt.h WRAP arch/arm/include/generated/asm/resource.h WRAP arch/arm/include/generated/asm/rwsem.h WRAP arch/arm/include/generated/asm/seccomp.h WRAP arch/arm/include/generated/asm/sections.h WRAP arch/arm/include/generated/asm/segment.h WRAP arch/arm/include/generated/asm/serial.h WRAP arch/arm/include/generated/asm/sembuf.h WRAP arch/arm/include/generated/asm/shmbuf.h WRAP arch/arm/include/generated/asm/siginfo.h WRAP arch/arm/include/generated/asm/simd.h WRAP arch/arm/include/generated/asm/sizes.h WRAP arch/arm/include/generated/asm/socket.h WRAP arch/arm/include/generated/asm/sockios.h WRAP arch/arm/include/generated/asm/termbits.h WRAP arch/arm/include/generated/asm/termios.h WRAP arch/arm/include/generated/asm/timex.h WRAP arch/arm/include/generated/asm/trace_clock.h WRAP arch/arm/include/generated/asm/unaligned.h UPD include/config/kernel.release Using /home/kisskb/slave/src as source for kernel CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/kallsyms HOSTCC scripts/conmakehash HOSTCC scripts/asn1_compiler HOSTCC scripts/extract-cert HOSTCC scripts/sign-file HOSTCC scripts/genksyms/genksyms.o CC scripts/mod/empty.o CC scripts/mod/devicetable-offsets.s HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/dtc/data.o HOSTCC scripts/dtc/livetree.o HOSTCC scripts/dtc/util.o SHIPPED scripts/genksyms/parse.tab.h SHIPPED scripts/genksyms/lex.lex.c HOSTCC scripts/dtc/dtc.o HOSTCC scripts/dtc/treesource.o cc1: error: unrecognized command line option '-fstack-protector-strong' SHIPPED scripts/genksyms/parse.tab.c SHIPPED scripts/dtc/dtc-parser.tab.h HOSTCC scripts/dtc/checks.o /home/kisskb/slave/src/scripts/Makefile.build:153: recipe for target 'scripts/mod/devicetable-offsets.s' failed SHIPPED scripts/dtc/dtc-parser.tab.c make[3]: *** [scripts/mod/devicetable-offsets.s] Error 1 make[3]: *** Waiting for unfinished jobs.... SHIPPED scripts/genksyms/keywords.hash.c HOSTCC scripts/dtc/fstree.o HOSTCC scripts/dtc/flattree.o HOSTCC scripts/dtc/srcpos.o cc1: error: unrecognized command line option '-fstack-protector-strong' /home/kisskb/slave/src/scripts/Makefile.build:258: recipe for target 'scripts/mod/empty.o' failed make[3]: *** [scripts/mod/empty.o] Error 1 SHIPPED scripts/dtc/dtc-lexer.lex.c HOSTCC scripts/dtc/dtc-parser.tab.o HOSTCC scripts/genksyms/lex.lex.o HOSTCC scripts/genksyms/parse.tab.o Generating include/generated/mach-types.h CHK include/generated/timeconst.h UPD include/generated/timeconst.h CC kernel/bounds.s 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 /home/kisskb/slave/src/Makefile:993: recipe for target 'prepare0' failed make[1]: *** [prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... HOSTCC scripts/dtc/dtc-lexer.lex.o /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.... HOSTLD scripts/dtc/dtc 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_arm-randconfig_arm' Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 48 ARCH=arm O=/home/kisskb/slave/build/linus_arm-randconfig_arm CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- ' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/linus_arm-randconfig_arm # Build took: 0:00:03.856774