# git rev-parse -q --verify c1f10ac840caced7a9f717d4170dcc14b3fac076^{commit} c1f10ac840caced7a9f717d4170dcc14b3fac076 already have revision, skipping fetch # git checkout -q -f -B kisskb c1f10ac840caced7a9f717d4170dcc14b3fac076 # git clean -qxdf # < git log -1 # commit c1f10ac840caced7a9f717d4170dcc14b3fac076 # Merge: 90a498f294c2 719fcafe07c1 # Author: Linus Torvalds # Date: Sat Mar 16 11:44:00 2024 -0700 # # Merge tag 'nfs-for-6.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs # # Pull NFS client updates from Trond Myklebust: # "Highlights include: # # Bugfixes: # - Fix for an Oops in the NFSv4.2 listxattr handler # - Correct an incorrect buffer size in listxattr # - Fix for an Oops in the pNFS flexfiles layout # - Fix a refcount leak in NFS O_DIRECT writes # - Fix missing locking in NFS O_DIRECT # - Avoid an infinite loop in pnfs_update_layout # - Fix an overflow in the RPC waitqueue queue length counter # - Ensure that pNFS I/O is also protected by TLS when xprtsec is # specified by the mount options # - Fix a leaked folio lock in the netfs read code # - Fix a potential deadlock in fscache # - Allow setting the fscache uniquifier in NFSv4 # - Fix an off by one in root_nfs_cat() # - Fix another off by one in rpc_sockaddr2uaddr() # - nfs4_do_open() can incorrectly trigger state recovery # - Various fixes for connection shutdown # # Features and cleanups: # - Ensure that containers only see their own RPC and NFS stats # - Enable nconnect for RDMA # - Remove dead code from nfs_writepage_locked() # - Various tracepoint additions to track EXCHANGE_ID, GETDEVICEINFO, # and mount options" # # * tag 'nfs-for-6.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (29 commits) # nfs: fix panic when nfs4_ff_layout_prepare_ds() fails # NFS: trace the uniquifier of fscache # NFS: Read unlock folio on nfs_page_create_from_folio() error # NFS: remove unused variable nfs_rpcstat # nfs: fix UAF in direct writes # nfs: properly protect nfs_direct_req fields # NFS: enable nconnect for RDMA # NFSv4: nfs4_do_open() is incorrectly triggering state recovery # NFS: avoid infinite loop in pnfs_update_layout. # NFS: remove sync_mode test from nfs_writepage_locked() # NFSv4.1/pnfs: fix NFS with TLS in pnfs # NFS: Fix an off by one in root_nfs_cat() # nfs: make the rpc_stat per net namespace # nfs: expose /proc/net/sunrpc/nfs in net namespaces # sunrpc: add a struct rpc_stats arg to rpc_create_args # nfs: remove unused NFS_CALL macro # NFSv4.1: add tracepoint to trunked nfs4_exchange_id calls # NFS: Fix nfs_netfs_issue_read() xarray locking for writeback interrupt # SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int # nfs: fix regression in handling of fsc= option in NFSv4 # ... # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-ld --version # < git log --format=%s --max-count=1 c1f10ac840caced7a9f717d4170dcc14b3fac076 # make -s -j 32 ARCH=riscv O=/kisskb/build/linus_rv32_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- rv32_defconfig Using .config as base Merging /kisskb/src/arch/riscv/configs/32-bit.config Value of CONFIG_PORTABLE is redefined by fragment /kisskb/src/arch/riscv/configs/32-bit.config: Previous value: CONFIG_PORTABLE=y New value: # CONFIG_PORTABLE is not set Value of CONFIG_NONPORTABLE is redefined by fragment /kisskb/src/arch/riscv/configs/32-bit.config: Previous value: # CONFIG_NONPORTABLE is not set New value: CONFIG_NONPORTABLE=y # # merged configuration written to .config (needs make) # .config:6329:warning: override: ARCH_RV32I changes choice state # < make -s -j 32 ARCH=riscv O=/kisskb/build/linus_rv32_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- help # make -s -j 32 ARCH=riscv O=/kisskb/build/linus_rv32_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- olddefconfig # make -s -j 32 ARCH=riscv O=/kisskb/build/linus_rv32_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- In file included from /kisskb/src/arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts:6: /kisskb/src/arch/riscv/boot/dts/sophgo/sg2042.dtsi:9:10: fatal error: dt-bindings/reset/sophgo,sg2042-reset.h: No such file or directory 9 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[4]: *** [/kisskb/src/scripts/Makefile.lib:421: arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dtb] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/riscv/boot/dts/sophgo] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1387: dtbs] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 32 ARCH=riscv O=/kisskb/build/linus_rv32_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_rv32_defconfig_riscv-gcc13 # Build took: 0:00:07.902193