# 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/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 0fac198def2b41138850867b6aa92044c76ff802 # < make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig arch/m68k/configs/sun3_defconfig:37:warning: symbol value 'm' invalid for ZPOOL # < make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:529, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:108: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:12: note: in definition of macro '__swab16' __fswab16(x)) ^ /kisskb/src/include/linux/printk.h:464:26: note: in expansion of macro 'printk_index_wrap' #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:3: note: in expansion of macro 'printk' printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); ^~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc8 # Build took: 0:00:39.414420