# git rev-parse -q --verify 968f3e374faf41e5e6049399eb7302777a09a1e8^{commit} 968f3e374faf41e5e6049399eb7302777a09a1e8 already have revision, skipping fetch # git checkout -q -f -B kisskb 968f3e374faf41e5e6049399eb7302777a09a1e8 # git clean -qxdf # git log -1 commit 968f3e374faf41e5e6049399eb7302777a09a1e8 Merge: e531cdf 389f239 Author: Linus Torvalds Date: Mon Mar 21 18:12:42 2016 -0700 Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs updates from Chris Mason: "We have a good sized cleanup of our internal read ahead code, and the first series of commits from Chandan to enable PAGE_SIZE > sectorsize Otherwise, it's a normal series of cleanups and fixes, with many thanks to Dave Sterba for doing most of the patch wrangling this time" * 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (82 commits) btrfs: make sure we stay inside the bvec during __btrfs_lookup_bio_sums btrfs: Fix misspellings in comments. btrfs: Print Warning only if ENOSPC_DEBUG is enabled btrfs: scrub: silence an uninitialized variable warning btrfs: move btrfs_compression_type to compression.h btrfs: rename btrfs_print_info to btrfs_print_mod_info Btrfs: Show a warning message if one of objectid reaches its highest value Documentation: btrfs: remove usage specific information btrfs: use kbasename in btrfsic_mount Btrfs: do not collect ordered extents when logging that inode exists Btrfs: fix race when checking if we can skip fsync'ing an inode Btrfs: fix listxattrs not listing all xattrs packed in the same item Btrfs: fix deadlock between direct IO reads and buffered writes Btrfs: fix extent_same allowing destination offset beyond i_size Btrfs: fix file loss on log replay after renaming a file and fsync Btrfs: fix unreplayable log after snapshot delete + parent dir fsync Btrfs: fix lockdep deadlock warning due to dev_replace btrfs: drop unused argument in btrfs_ioctl_get_supported_features btrfs: add GET_SUPPORTED_FEATURES to the control device ioctls btrfs: change max_inline default to 2048 ... # < /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 968f3e374faf41e5e6049399eb7302777a09a1e8 # < 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=0x6F3BAD0 # 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/clkdev.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 CHK include/generated/uapi/linux/version.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 WRAP arch/arm/include/generated/asm/mm-arch-hooks.h UPD include/generated/uapi/linux/version.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 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/segment.h WRAP arch/arm/include/generated/asm/sembuf.h WRAP arch/arm/include/generated/asm/serial.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/sortextable HOSTCC scripts/asn1_compiler HOSTCC scripts/sign-file HOSTCC scripts/extract-cert 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 CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/genksyms/parse.tab.o CC scripts/mod/devicetable-offsets.s HOSTCC scripts/dtc/dtc.o HOSTCC scripts/genksyms/lex.lex.o HOSTCC scripts/dtc/flattree.o cc1: error: unrecognized command line option '-fstack-protector-strong' cc1: error: unrecognized command line option '-fstack-protector-strong'/home/kisskb/slave/src/scripts/Makefile.build:291: recipe for target 'scripts/mod/empty.o' failed make[3]: *** [scripts/mod/empty.o] Error 1 make[3]: *** Waiting for unfinished jobs.... /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 HOSTCC scripts/dtc/fstree.o HOSTCC scripts/dtc/data.o HOSTCC scripts/dtc/livetree.o HOSTCC scripts/dtc/treesource.o HOSTCC scripts/dtc/srcpos.o HOSTCC scripts/dtc/checks.o HOSTCC scripts/dtc/util.o SHIPPED scripts/dtc/dtc-lexer.lex.c SHIPPED scripts/dtc/dtc-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc-parser.tab.o HOSTCC scripts/dtc/dtc-lexer.lex.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.... /home/kisskb/slave/src/scripts/Makefile.build:440: 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:04.986812