# git rev-parse -q --verify 73e2e0c9b13c97df1c8565f6e158caac3c481b44^{commit} 73e2e0c9b13c97df1c8565f6e158caac3c481b44 already have revision, skipping fetch # git checkout -q -f -B kisskb 73e2e0c9b13c97df1c8565f6e158caac3c481b44 # git clean -qxdf # git log -1 commit 73e2e0c9b13c97df1c8565f6e158caac3c481b44 Merge: ed3c5a0 2549f30 Author: Linus Torvalds Date: Thu Dec 15 18:47:31 2016 -0800 Merge tag 'nfs-for-4.10-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs Pull NFS client updates from Trond Myklebust: "Highlights include: Stable bugfixes: - Fix a pnfs deadlock between read resends and layoutreturn - Don't invalidate the layout stateid while a layout return is outstanding - Don't schedule a layoutreturn if the layout stateid is marked as invalid - On a pNFS error, do not send LAYOUTGET until the LAYOUTRETURN is complete - SUNRPC: fix refcounting problems with auth_gss messages. Features: - Add client support for the NFSv4 umask attribute. - NFSv4: Correct support for flock() stateids. - Add a LAYOUTRETURN operation to CLOSE and DELEGRETURN when return-on-close is specified - Allow the pNFS/flexfiles layoutstat information to piggyback on LAYOUTRETURN - Optimise away redundant GETATTR calls when doing state recovery and/or when not required by cache revalidation rules or close-to-open cache consistency. - Attribute cache improvements - RPC/RDMA support for SG_GAP devices Bugfixes: - NFS: Fix performance regressions in readdir - pNFS/flexfiles: Fix a deadlock on LAYOUTGET - NFSv4: Add missing nfs_put_lock_context() - NFSv4.1: Fix regression in callback retry handling - Fix false positive NFSv4.0 trunking detection. - pNFS/flexfiles: Only send layoutstats updates for mirrors that were updated - Various layout stateid related bugfixes - RPC/RDMA bugfixes" * tag 'nfs-for-4.10-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (82 commits) SUNRPC: fix refcounting problems with auth_gss messages. nfs: add support for the umask attribute pNFS/flexfiles: Ensure we have enough buffer for layoutreturn pNFS/flexfiles: Remove a redundant parameter in ff_layout_encode_ioerr() pNFS/flexfiles: Fix a deadlock on LAYOUTGET pNFS: Layoutreturn must free the layout after the layout-private data pNFS/flexfiles: Fix ff_layout_add_ds_error_locked() NFSv4: Add missing nfs_put_lock_context() pNFS: Release NFS_LAYOUT_RETURN when invalidating the layout stateid NFSv4.1: Don't schedule lease recovery in nfs4_schedule_session_recovery() NFSv4.1: Handle NFS4ERR_BADSESSION/NFS4ERR_DEADSESSION replies to OP_SEQUENCE NFS: Only look at the change attribute cache state in nfs_check_verifier NFS: Fix incorrect size revalidation when holding a delegation NFS: Fix incorrect mapping revalidation when holding a delegation pNFS/flexfiles: Support sending layoutstats in layoutreturn pNFS/flexfiles: Minor refactoring before adding iostats to layoutreturn NFS: Fix up read of mirror stats pNFS/flexfiles: Clean up layoutstats pNFS/flexfiles: Refactor encoding of the layoutreturn payload pNFS: Add a layoutreturn callback to performa layout-private setup ... # < /opt/cross/kisskb/gcc-4.6.3-nolibc/bfin-uclinux/bin/bfin-uclinux-gcc --version # < git log --format=%s --max-count=1 73e2e0c9b13c97df1c8565f6e158caac3c481b44 # < make -j 10 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 10 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/current.h WRAP arch/blackfin/include/generated/asm/auxvec.h WRAP arch/blackfin/include/generated/asm/bitsperlong.h WRAP arch/blackfin/include/generated/asm/device.h WRAP arch/blackfin/include/generated/asm/bugs.h WRAP arch/blackfin/include/generated/asm/cputime.h WRAP arch/blackfin/include/generated/asm/emergency-restart.h WRAP arch/blackfin/include/generated/asm/errno.h WRAP arch/blackfin/include/generated/asm/div64.h WRAP arch/blackfin/include/generated/asm/fb.h WRAP arch/blackfin/include/generated/asm/futex.h WRAP arch/blackfin/include/generated/asm/hw_irq.h WRAP arch/blackfin/include/generated/asm/ioctl.h WRAP arch/blackfin/include/generated/asm/ipcbuf.h WRAP arch/blackfin/include/generated/asm/irq_regs.h CHK include/generated/uapi/linux/version.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/irq_work.h WRAP arch/blackfin/include/generated/asm/kdebug.h WRAP arch/blackfin/include/generated/asm/local.h WRAP arch/blackfin/include/generated/asm/local64.h WRAP arch/blackfin/include/generated/asm/mcs_spinlock.h UPD include/generated/uapi/linux/version.h WRAP arch/blackfin/include/generated/asm/mm-arch-hooks.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 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 WRAP arch/blackfin/include/generated/asm/setup.h WRAP arch/blackfin/include/generated/asm/shmbuf.h WRAP arch/blackfin/include/generated/asm/shmparam.h WRAP arch/blackfin/include/generated/asm/socket.h WRAP arch/blackfin/include/generated/asm/sockios.h WRAP arch/blackfin/include/generated/asm/statfs.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:293: 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:1033: recipe for target 'prepare0' failed make[1]: *** [prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... /home/kisskb/slave/src/scripts/Makefile.build:544: recipe for target 'scripts/mod' failed make[2]: *** [scripts/mod] Error 2 make[2]: *** Waiting for unfinished jobs.... /home/kisskb/slave/src/Makefile:560: recipe for target 'scripts' failed make[1]: *** [scripts] Error 2 make[1]: Leaving directory '/home/kisskb/slave/build/linus_TCM-BF518_defconfig_bfin' Makefile:150: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 10 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:05.997476