# git rev-parse -q --verify 9763dd6f8160dc9cc239fc2427c8173073204457^{commit} 9763dd6f8160dc9cc239fc2427c8173073204457 already have revision, skipping fetch # git checkout -q -f -B kisskb 9763dd6f8160dc9cc239fc2427c8173073204457 # git clean -qxdf # git log -1 commit 9763dd6f8160dc9cc239fc2427c8173073204457 Merge: 70fcf5c c548a1c Author: Linus Torvalds Date: Tue Feb 21 07:46:34 2017 -0800 Merge tag 'gfs2-4.11.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 Pull GFS2 updates from Robert Peterson: "We've got eight GFS2 patches for this merge window: - Andy Price submitted a patch to make gfs2_write_full_page a static function. - Dan Carpenter submitted a patch to fix a ERR_PTR thinko. Three patches fix bugs related to deleting very large files, which cause GFS2 to run out of journal space: - The first one prevents GFS2 delete operation from requesting too much journal space. - The second one fixes a problem whereby GFS2 can hang because it wasn't taking journal space demand into its calculations. - The third one wakes up IO waiters when a flush is done to restart processes stuck waiting for journal space to become available. The final three patches are a performance improvement related to spin_lock contention between multiple writers: - The "tr_touched" variable was switched to a flag to be more atomic and eliminate the possibility of some races. - Function meta_lo_add was moved inline with its only caller to make the code more readable and efficient. - Contention on the gfs2_log_lock spinlock was greatly reduced by avoiding the lock altogether in cases where we don't really need it: buffers that already appear in the appropriate metadata list for the journal. Many thanks to Steve Whitehouse for the ideas and principles behind these patches" * tag 'gfs2-4.11.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: gfs2: Make gfs2_write_full_page static GFS2: Reduce contention on gfs2_log_lock GFS2: Inline function meta_lo_add GFS2: Switch tr_touched to flag in transaction GFS2: Wake up io waiters whenever a flush is done GFS2: Made logd daemon take into account log demand GFS2: Limit number of transaction blocks requested for truncates GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next # < /opt/cross/kisskb/gcc-4.6.3-nolibc/bfin-uclinux/bin/bfin-uclinux-gcc --version # < git log --format=%s --max-count=1 9763dd6f8160dc9cc239fc2427c8173073204457 # < make -j 48 ARCH=blackfin O=/home/kisskb/slave/build/linus_TCM-BF518_defconfig_bfin CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/bfin-uclinux/bin/bfin-uclinux- TCM-BF518_defconfig # make -j 48 ARCH=blackfin O=/home/kisskb/slave/build/linus_TCM-BF518_defconfig_bfin CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/bfin-uclinux/bin/bfin-uclinux- make[1]: Entering directory '/home/kisskb/slave/build/linus_TCM-BF518_defconfig_bfin' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config/kernel.release GEN ./Makefile WRAP arch/blackfin/include/generated/asm/auxvec.h WRAP arch/blackfin/include/generated/asm/bitsperlong.h WRAP arch/blackfin/include/generated/asm/bugs.h WRAP arch/blackfin/include/generated/asm/current.h WRAP arch/blackfin/include/generated/asm/errno.h WRAP arch/blackfin/include/generated/asm/device.h WRAP arch/blackfin/include/generated/asm/fb.h WRAP arch/blackfin/include/generated/asm/div64.h WRAP arch/blackfin/include/generated/asm/ioctl.h WRAP arch/blackfin/include/generated/asm/futex.h WRAP arch/blackfin/include/generated/asm/emergency-restart.h WRAP arch/blackfin/include/generated/asm/ipcbuf.h WRAP arch/blackfin/include/generated/asm/hw_irq.h WRAP arch/blackfin/include/generated/asm/irq_regs.h WRAP arch/blackfin/include/generated/asm/irq_work.h WRAP arch/blackfin/include/generated/asm/kmap_types.h WRAP arch/blackfin/include/generated/asm/kvm_para.h WRAP arch/blackfin/include/generated/asm/kdebug.h WRAP arch/blackfin/include/generated/asm/local64.h WRAP arch/blackfin/include/generated/asm/local.h WRAP arch/blackfin/include/generated/asm/mm-arch-hooks.h WRAP arch/blackfin/include/generated/asm/mcs_spinlock.h WRAP arch/blackfin/include/generated/asm/mman.h WRAP arch/blackfin/include/generated/asm/msgbuf.h WRAP arch/blackfin/include/generated/asm/param.h WRAP arch/blackfin/include/generated/asm/percpu.h WRAP arch/blackfin/include/generated/asm/pgalloc.h CHK include/generated/uapi/linux/version.h WRAP arch/blackfin/include/generated/asm/preempt.h WRAP arch/blackfin/include/generated/asm/resource.h WRAP arch/blackfin/include/generated/asm/sembuf.h WRAP arch/blackfin/include/generated/asm/serial.h UPD include/generated/uapi/linux/version.h WRAP arch/blackfin/include/generated/asm/setup.h WRAP arch/blackfin/include/generated/asm/socket.h WRAP arch/blackfin/include/generated/asm/shmbuf.h WRAP arch/blackfin/include/generated/asm/sockios.h WRAP arch/blackfin/include/generated/asm/statfs.h WRAP arch/blackfin/include/generated/asm/shmparam.h WRAP arch/blackfin/include/generated/asm/termbits.h WRAP arch/blackfin/include/generated/asm/termios.h WRAP arch/blackfin/include/generated/asm/topology.h WRAP arch/blackfin/include/generated/asm/trace_clock.h WRAP arch/blackfin/include/generated/asm/types.h WRAP arch/blackfin/include/generated/asm/ucontext.h WRAP arch/blackfin/include/generated/asm/unaligned.h WRAP arch/blackfin/include/generated/asm/user.h WRAP arch/blackfin/include/generated/asm/word-at-a-time.h WRAP arch/blackfin/include/generated/asm/xor.h HOSTCC scripts/basic/bin2c 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 CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s cc1: error: -mcpu=bf518-0.1 has invalid silicon revision cc1: error: unrecognized command line option '-mcpu=bf518-0.1' /home/kisskb/slave/src/scripts/Makefile.build:294: recipe for target 'scripts/mod/empty.o' failed make[3]: *** [scripts/mod/empty.o] Error 1 make[3]: *** Waiting for unfinished jobs.... cc1: error: -mcpu=bf518-0.1 has invalid silicon revision cc1: error: unrecognized command line option '-mcpu=bf518-0.1' /home/kisskb/slave/src/scripts/Makefile.build:154: recipe for target 'scripts/mod/devicetable-offsets.s' failed make[3]: *** [scripts/mod/devicetable-offsets.s] Error 1 CHK include/generated/timeconst.h CC kernel/bounds.s cc1: error: -mcpu=bf518-0.1 has invalid silicon revision cc1: error: unrecognized command line option '-mcpu=bf518-0.1' UPD include/generated/timeconst.h /home/kisskb/slave/src/./Kbuild:45: 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:1035: recipe for target 'prepare0' failed make[1]: *** [prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... /home/kisskb/slave/src/scripts/Makefile.build:553: recipe for target 'scripts/mod' failed make[2]: *** [scripts/mod] Error 2 make[2]: *** Waiting for unfinished jobs.... /home/kisskb/slave/src/Makefile:562: recipe for target 'scripts' failed make[1]: *** [scripts] Error 2 make[1]: Leaving directory '/home/kisskb/slave/build/linus_TCM-BF518_defconfig_bfin' Makefile:152: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 48 ARCH=blackfin O=/home/kisskb/slave/build/linus_TCM-BF518_defconfig_bfin CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/bfin-uclinux/bin/bfin-uclinux- ' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/linus_TCM-BF518_defconfig_bfin # Build took: 0:00:04.013919