# git rev-parse -q --verify 6bc986ab839c844e78a2333a02e55f02c9e57935^{commit} 6bc986ab839c844e78a2333a02e55f02c9e57935 already have revision, skipping fetch # git checkout -q -f -B kisskb 6bc986ab839c844e78a2333a02e55f02c9e57935 # git clean -qxdf # < git log -1 # commit 6bc986ab839c844e78a2333a02e55f02c9e57935 # Merge: 67c0afb6424f f003a717ae90 # Author: Linus Torvalds # Date: Wed Nov 8 13:39:16 2023 -0800 # # Merge tag 'nfs-for-6.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs # # Pull NFS client updates from Trond Myklebust: # "Bugfixes: # # - SUNRPC: # - re-probe the target RPC port after an ECONNRESET error # - handle allocation errors from rpcb_call_async() # - fix a use-after-free condition in rpc_pipefs # - fix up various checks for timeouts # # - NFSv4.1: # - Handle NFS4ERR_DELAY errors during session trunking # - fix SP4_MACH_CRED protection for pnfs IO # # - NFSv4: # - Ensure that we test all delegations when the server notifies # us that it may have revoked some of them # # Features: # # - Allow knfsd processes to break out of NFS4ERR_DELAY loops when # re-exporting NFSv4.x by setting appropriate values for the # 'delay_retrans' module parameter # # - nfs: Convert nfs_symlink() to use a folio" # # * tag 'nfs-for-6.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: # nfs: Convert nfs_symlink() to use a folio # SUNRPC: Fix RPC client cleaned up the freed pipefs dentries # NFSv4.1: fix SP4_MACH_CRED protection for pnfs IO # SUNRPC: Add an IS_ERR() check back to where it was # NFSv4.1: fix handling NFS4ERR_DELAY when testing for session trunking # nfs41: drop dependency between flexfiles layout driver and NFSv3 modules # NFSv4: fairly test all delegations on a SEQ4_ revocation # SUNRPC: SOFTCONN tasks should time out when on the sending list # SUNRPC: Force close the socket when a hard error is reported # SUNRPC: Don't skip timeout checks in call_connect_status() # SUNRPC: ECONNRESET might require a rebind # NFSv4/pnfs: Allow layoutget to return EAGAIN for softerr mounts # NFSv4: Add a parameter to limit the number of retries after NFS4ERR_DELAY # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 6bc986ab839c844e78a2333a02e55f02c9e57935 # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_new': /kisskb/src/kernel/bpf/task_iter.c:917:14: error: 'CSS_TASK_ITER_PROCS' undeclared (first use in this function) 917 | case CSS_TASK_ITER_PROCS | CSS_TASK_ITER_THREADED: | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/kernel/bpf/task_iter.c:917:14: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/kernel/bpf/task_iter.c:917:36: error: 'CSS_TASK_ITER_THREADED' undeclared (first use in this function) 917 | case CSS_TASK_ITER_PROCS | CSS_TASK_ITER_THREADED: | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/kernel/bpf/task_iter.c:925:60: error: invalid application of 'sizeof' to incomplete type 'struct css_task_iter' 925 | kit->css_it = bpf_mem_alloc(&bpf_global_ma, sizeof(struct css_task_iter)); | ^~~~~~ /kisskb/src/kernel/bpf/task_iter.c:928:9: error: implicit declaration of function 'css_task_iter_start'; did you mean 'task_seq_start'? [-Werror=implicit-function-declaration] 928 | css_task_iter_start(css, flags, kit->css_it); | ^~~~~~~~~~~~~~~~~~~ | task_seq_start /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_next': /kisskb/src/kernel/bpf/task_iter.c:938:16: error: implicit declaration of function 'css_task_iter_next'; did you mean 'class_dev_iter_next'? [-Werror=implicit-function-declaration] 938 | return css_task_iter_next(kit->css_it); | ^~~~~~~~~~~~~~~~~~ | class_dev_iter_next /kisskb/src/kernel/bpf/task_iter.c:938:16: warning: returning 'int' from a function with return type 'struct task_struct *' makes pointer from integer without a cast [-Wint-conversion] 938 | return css_task_iter_next(kit->css_it); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/kernel/bpf/task_iter.c: In function 'bpf_iter_css_task_destroy': /kisskb/src/kernel/bpf/task_iter.c:947:9: error: implicit declaration of function 'css_task_iter_end' [-Werror=implicit-function-declaration] 947 | css_task_iter_end(kit->css_it); | ^~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: kernel/bpf/task_iter.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:480: kernel/bpf] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:480: kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1911: .] Error 2 make[1]: *** [/kisskb/src/Makefile:234: __sub-make] Error 2 make: *** [Makefile:234: __sub-make] Error 2 Command 'make -s -j 40 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:00:55.163878