# git rev-parse -q --verify 13d88ac54ddd1011b6e94443958e798aa06eb835^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 13d88ac54ddd1011b6e94443958e798aa06eb835^{commit} 13d88ac54ddd1011b6e94443958e798aa06eb835 # git checkout -q -f -B kisskb 13d88ac54ddd1011b6e94443958e798aa06eb835 # git clean -qxdf # < git log -1 # commit 13d88ac54ddd1011b6e94443958e798aa06eb835 # Merge: 062cca8915ca 4ad714df58e6 # Author: Linus Torvalds # Date: Tue Nov 7 12:11:26 2023 -0800 # # Merge tag 'vfs-6.7.fsid' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs # # Pull vfs fanotify fsid updates from Christian Brauner: # "This work is part of the plan to enable fanotify to serve as a drop-in # replacement for inotify. While inotify is availabe on all filesystems, # fanotify currently isn't. # # In order to support fanotify on all filesystems two things are needed: # # (1) all filesystems need to support AT_HANDLE_FID # # (2) all filesystems need to report a non-zero f_fsid # # This contains (1) and allows filesystems to encode non-decodable file # handlers for fanotify without implementing any exportfs operations by # encoding a file id of type FILEID_INO64_GEN from i_ino and # i_generation. # # Filesystems that want to opt out of encoding non-decodable file ids # for fanotify that don't support NFS export can do so by providing an # empty export_operations struct. # # This also partially addresses (2) by generating f_fsid for simple # filesystems as well as freevxfs. Remaining filesystems will be dealt # with by separate patches. # # Finally, this contains the patch from the current exportfs maintainers # which moves exportfs under vfs with Chuck, Jeff, and Amir as # maintainers and vfs.git as tree" # # * tag 'vfs-6.7.fsid' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: # MAINTAINERS: create an entry for exportfs # fs: fix build error with CONFIG_EXPORTFS=m or not defined # freevxfs: derive f_fsid from bdev->bd_dev # fs: report f_fsid from s_dev for "simple" filesystems # exportfs: support encoding non-decodeable file handles by default # exportfs: define FILEID_INO64_GEN* file handle types # exportfs: make ->encode_fh() a mandatory method for NFS export # exportfs: add helpers to check if filesystem can encode/decode file handles # < /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 13d88ac54ddd1011b6e94443958e798aa06eb835 # 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[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 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:20.893867