# git rev-parse -q --verify 4652b8e4f3ffa48c706ec334f048c217a7d9750d^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 4652b8e4f3ffa48c706ec334f048c217a7d9750d^{commit} 4652b8e4f3ffa48c706ec334f048c217a7d9750d # git checkout -q -f -B kisskb 4652b8e4f3ffa48c706ec334f048c217a7d9750d # git clean -qxdf # < git log -1 # commit 4652b8e4f3ffa48c706ec334f048c217a7d9750d # Merge: 71fb7b320b28 67797da8a4b8 # Author: Linus Torvalds # Date: Thu Nov 2 08:32:07 2023 -1000 # # Merge tag '6.7-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd # # Pull smb server updates from Steve French: # "Seven ksmbd server fixes: # # - logoff improvement for multichannel bound connections # # - unicode fix for surrogate pairs # # - RDMA (smbdirect) fix for IB devices # # - fix locking deadlock in kern_path_create during rename # # - iov memory allocation fix # # - two minor cleanup patches (doc cleanup, and unused variable)" # # * tag '6.7-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd: # ksmbd: no need to wait for binded connection termination at logoff # ksmbd: add support for surrogate pair conversion # ksmbd: fix missing RDMA-capable flag for IPoIB device in ksmbd_rdma_capable_netdev() # ksmbd: fix recursive locking in vfs helpers # ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr() # ksmbd: reorganize ksmbd_iov_pin_rsp() # ksmbd: Remove unused field in ksmbd_user struct # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 4652b8e4f3ffa48c706ec334f048c217a7d9750d # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- defconfig # < make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.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:7: error: 'CSS_TASK_ITER_PROCS' undeclared (first use in this function); did you mean 'BPF_TASK_ITER_TGID'? case CSS_TASK_ITER_PROCS | CSS_TASK_ITER_THREADED: ^~~~~~~~~~~~~~~~~~~ BPF_TASK_ITER_TGID /kisskb/src/kernel/bpf/task_iter.c:917:7: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/kernel/bpf/task_iter.c:917:29: error: 'CSS_TASK_ITER_THREADED' undeclared (first use in this function); did you mean 'BPF_TASK_ITER_TGID'? case CSS_TASK_ITER_PROCS | CSS_TASK_ITER_THREADED: ^~~~~~~~~~~~~~~~~~~~~~ BPF_TASK_ITER_TGID /kisskb/src/kernel/bpf/task_iter.c:925:53: error: invalid application of 'sizeof' to incomplete type 'struct css_task_iter' kit->css_it = bpf_mem_alloc(&bpf_global_ma, sizeof(struct css_task_iter)); ^~~~~~ /kisskb/src/kernel/bpf/task_iter.c:928:2: error: implicit declaration of function 'css_task_iter_start'; did you mean 'task_seq_start'? [-Werror=implicit-function-declaration] 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:9: error: implicit declaration of function 'css_task_iter_next'; did you mean 'class_dev_iter_next'? [-Werror=implicit-function-declaration] return css_task_iter_next(kit->css_it); ^~~~~~~~~~~~~~~~~~ class_dev_iter_next /kisskb/src/kernel/bpf/task_iter.c:938:9: warning: returning 'int' from a function with return type 'struct task_struct *' makes pointer from integer without a cast [-Wint-conversion] 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:2: error: implicit declaration of function 'css_task_iter_end'; did you mean 'vma_iter_end'? [-Werror=implicit-function-declaration] css_task_iter_end(kit->css_it); ^~~~~~~~~~~~~~~~~ vma_iter_end 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[3]: *** [/kisskb/src/scripts/Makefile.build:480: kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1913: .] Error 2 make[1]: *** [/kisskb/src/Makefile:234: __sub-make] Error 2 make: *** [Makefile:234: __sub-make] Error 2 Command 'make -s -j 24 ARCH=m68k O=/kisskb/build/linus_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_defconfig_m68k-gcc8 # Build took: 0:03:10.260952