# git rev-parse -q --verify 74f602dc96dd854c7b2034947798c1e2a6b84066^{commit} 74f602dc96dd854c7b2034947798c1e2a6b84066 already have revision, skipping fetch # git checkout -q -f -B kisskb 74f602dc96dd854c7b2034947798c1e2a6b84066 # git clean -qxdf # < git log -1 # commit 74f602dc96dd854c7b2034947798c1e2a6b84066 # Merge: be695ee29e8f 52104f274e2d # Author: Linus Torvalds # Date: Thu Dec 17 12:15:03 2020 -0800 # # Merge tag 'nfs-for-5.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs # # Pull NFS client updates from Trond Myklebust: # "Highlights include: # # Features: # # - NFSv3: Add emulation of lookupp() to improve open_by_filehandle() # support # # - A series of patches to improve readdir performance, particularly # with large directories # # - Basic support for using NFS/RDMA with the pNFS files and flexfiles # drivers # # - Micro-optimisations for RDMA # # - RDMA tracing improvements # # Bugfixes: # # - Fix a long standing bug with xs_read_xdr_buf() when receiving # partial pages (Dan Aloni) # # - Various fixes for getxattr and listxattr, when used over non-TCP # transports # # - Fixes for containerised NFS from Sargun Dhillon # # - switch nfsiod to be an UNBOUND workqueue (Neil Brown) # # - READDIR should not ask for security label information if there is # no LSM policy (Olga Kornievskaia) # # - Avoid using interval-based rebinding with TCP in lockd (Calum # Mackay) # # - A series of RPC and NFS layer fixes to support the NFSv4.2 # READ_PLUS code # # - A couple of fixes for pnfs/flexfiles read failover # # Cleanups: # # - Various cleanups for the SUNRPC xdr code in conjunction with the # READ_PLUS fixes" # # * tag 'nfs-for-5.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (90 commits) # NFS/pNFS: Fix a typo in ff_layout_resend_pnfs_read() # pNFS/flexfiles: Avoid spurious layout returns in ff_layout_choose_ds_for_read # NFSv4/pnfs: Add tracing for the deviceid cache # fs/lockd: convert comma to semicolon # NFSv4.2: fix error return on memory allocation failure # NFSv4.2/pnfs: Don't use READ_PLUS with pNFS yet # NFSv4.2: Deal with potential READ_PLUS data extent buffer overflow # NFSv4.2: Don't error when exiting early on a READ_PLUS buffer overflow # NFSv4.2: Handle hole lengths that exceed the READ_PLUS read buffer # NFSv4.2: decode_read_plus_hole() needs to check the extent offset # NFSv4.2: decode_read_plus_data() must skip padding after data segment # NFSv4.2: Ensure we always reset the result->count in decode_read_plus() # SUNRPC: When expanding the buffer, we may need grow the sparse pages # SUNRPC: Cleanup - constify a number of xdr_buf helpers # SUNRPC: Clean up open coded setting of the xdr_stream 'nwords' field # SUNRPC: _copy_to/from_pages() now check for zero length # SUNRPC: Cleanup xdr_shrink_bufhead() # SUNRPC: Fix xdr_expand_hole() # SUNRPC: Fixes for xdr_align_data() # SUNRPC: _shift_data_left/right_pages should check the shift length # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 74f602dc96dd854c7b2034947798c1e2a6b84066 # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7785lcr_32bit_defconfig # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:279: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:117: scripts/mod/devicetable-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1205: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 # Build took: 0:00:04.713003