# git rev-parse -q --verify 0fac198def2b41138850867b6aa92044c76ff802^{commit} 0fac198def2b41138850867b6aa92044c76ff802 already have revision, skipping fetch # git checkout -q -f -B kisskb 0fac198def2b41138850867b6aa92044c76ff802 # git clean -qxdf # < git log -1 # commit 0fac198def2b41138850867b6aa92044c76ff802 # Merge: bdfae5ce3820 ba40a57ff08b # Author: Linus Torvalds # Date: Mon Aug 1 09:10:07 2022 -0700 # # Merge tag 'fs.idmapped.overlay.acl.v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux # # Pull acl updates from Christian Brauner: # "Last cycle we introduced support for mounting overlayfs on top of # idmapped mounts. While looking into additional testing we realized # that posix acls don't really work correctly with stacking filesystems # on top of idmapped layers. # # We already knew what the fix were but it would require work that is # more suitable for the merge window so we turned off posix acls for # v5.19 for overlayfs on top of idmapped layers with Miklos routing my # patch upstream in 72a8e05d4f66 ("Merge tag 'ovl-fixes-5.19-rc7' [..]"). # # This contains the work to support posix acls for overlayfs on top of # idmapped layers. Since the posix acl fixes should use the new # vfs{g,u}id_t work the associated branch has been merged in. (We sent a # pull request for this earlier.) # # We've also pulled in Miklos pull request containing my patch to turn # of posix acls on top of idmapped layers. This allowed us to avoid # rebasing the branch which we didn't like because we were already at # rc7 by then. Merging it in allows this branch to first fix posix acls # and then to cleanly revert the temporary fix it brought in by commit # 4a47c6385bb4 ("ovl: turn of SB_POSIXACL with idmapped layers # temporarily"). # # The last patch in this series adds Seth Forshee as a co-maintainer for # idmapped mounts. Seth has been integral to all of this work and is # also the main architect behind the filesystem idmapping work which # ultimately made filesystems such as FUSE and overlayfs available in # containers. He continues to be active in both development and review. # I'm very happy he decided to help and he has my full trust. This # increases the bus factor which is always great for work like this. I'm # honestly very excited about this because I think in general we don't # do great in the bringing on new maintainers department" # # For more explanations of the ACL issues, see # # https://lore.kernel.org/all/20220801145520.1532837-1-brauner@kernel.org/ # # * tag 'fs.idmapped.overlay.acl.v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux: # Add Seth Forshee as co-maintainer for idmapped mounts # Revert "ovl: turn of SB_POSIXACL with idmapped layers temporarily" # ovl: handle idmappings in ovl_get_acl() # acl: make posix_acl_clone() available to overlayfs # acl: port to vfs{g,u}id_t # acl: move idmapped mount fixup into vfs_{g,s}etxattr() # mnt_idmapping: add vfs[g,u]id_into_k[g,u]id() # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 0fac198def2b41138850867b6aa92044c76ff802 # < make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12359:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12364:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12366:warning: override: reassigning to symbol UML_NET_SLIP .config:12369:warning: override: reassigning to symbol UML_NET_MCAST .config:12371:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'rvt_wss_llc_size': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:88:22: error: 'struct cpuinfo_um' has no member named 'x86_cache_size' return boot_cpu_data.x86_cache_size; ^ /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'cacheless_memcpy': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:100:2: error: implicit declaration of function '__copy_user_nocache' [-Werror=implicit-function-declaration] __copy_user_nocache(dst, (void __user *)src, n, 0); ^ /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'rvt_wss_llc_size': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:89:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/infiniband/sw/rdmavt/qp.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/infiniband/sw/rdmavt] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/infiniband/sw] Error 2 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c: In function 'qib_unordered_wc': /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:22: error: 'struct cpuinfo_um' has no member named 'x86_vendor' return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: error: 'X86_VENDOR_AMD' undeclared (first use in this function) return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:150:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/infiniband/hw/qib] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/infiniband/hw] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/infiniband] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:26: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1610:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1614:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:24: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c: In function 'kfd_fill_iolink_info_for_cpu': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1777:27: note: in expansion of macro 'cpu_data' struct cpuinfo_x86 *c = &cpu_data(0); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1780:7: error: dereferencing pointer to incomplete type 'struct cpuinfo_x86' if (c->x86_vendor == X86_VENDOR_AMD) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1780:23: error: 'X86_VENDOR_AMD' undeclared (first use in this function) if (c->x86_vendor == X86_VENDOR_AMD) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1780:23: note: each undeclared identifier is reported only once for each function it appears in make[5]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1843: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 120 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:04:19.170869