# git rev-parse -q --verify f8fbb47c6e86c0b75f8df864db702c3e3f757361^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify f8fbb47c6e86c0b75f8df864db702c3e3f757361^{commit} f8fbb47c6e86c0b75f8df864db702c3e3f757361 # git checkout -q -f -B kisskb f8fbb47c6e86c0b75f8df864db702c3e3f757361 # git clean -qxdf # < git log -1 # commit f8fbb47c6e86c0b75f8df864db702c3e3f757361 # Merge: 59cd4f435ee9 f153c2246783 # Author: Linus Torvalds # Date: Thu Aug 12 07:20:16 2021 -1000 # # Merge branch 'for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace # # Pull ucounts fix from Eric Biederman: # "This fixes the ucount sysctls on big endian architectures. # # The counts were expanded to be longs instead of ints, and the sysctl # code was overlooked, so only the low 32bit were being processed. On # litte endian just processing the low 32bits is fine, but on 64bit big # endian processing just the low 32bits results in the high order bits # instead of the low order bits being processed and nothing works # proper. # # This change took a little bit to mature as we have the SYSCTL_ZERO, # and SYSCTL_INT_MAX macros that are only usable for sysctls operating # on ints, but unfortunately are not obviously broken. Which resulted in # the versions of this change working on big endian and not on little # endian, because the int SYSCTL_ZERO when extended 64bit wound up being # 0x100000000. So we only allowed values greater than 0x100000000 and # less than 0faff. Which unfortunately broken everything that tried to # set the sysctls. (First reported with the windows subsystem for # linux). # # I have tested this on x86_64 64bit after first reproducing the # problems with the earlier version of this change, and then verifying # the problems do not exist when we use appropriate long min and max # values for extra1 and extra2" # # * 'for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: # ucounts: add missing data type changes # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 f8fbb47c6e86c0b75f8df864db702c3e3f757361 # < make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- defconfig # < make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- help # make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- olddefconfig # make -s -j 32 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- /kisskb/src/security/landlock/ruleset.c: In function 'insert_rule': /kisskb/src/security/landlock/ruleset.c:196:34: warning: passing argument 2 of 'create_rule' from incompatible pointer type new_rule = create_rule(object, &this->layers, this->num_layers, ^ /kisskb/src/security/landlock/ruleset.c:69:30: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[]' static struct landlock_rule *create_rule( ^ /kisskb/src/security/landlock/ruleset.c: In function 'landlock_insert_rule': /kisskb/src/security/landlock/ruleset.c:240:38: warning: passing argument 3 of 'insert_rule' from incompatible pointer type return insert_rule(ruleset, object, &layers, ARRAY_SIZE(layers)); ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[1]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ /kisskb/src/security/landlock/ruleset.c: In function 'merge_ruleset': /kisskb/src/security/landlock/ruleset.c:300:47: warning: passing argument 3 of 'insert_rule' from incompatible pointer type err = insert_rule(dst, walker_rule->object, &layers, ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[1]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ /kisskb/src/security/landlock/ruleset.c: In function 'inherit_ruleset': /kisskb/src/security/landlock/ruleset.c:330:5: warning: passing argument 3 of 'insert_rule' from incompatible pointer type &walker_rule->layers, walker_rule->num_layers); ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ /kisskb/src/net/sched/sch_frag.c: In function 'sch_fragment': /kisskb/src/net/sched/sch_frag.c:93:10: warning: missing braces around initializer [-Wmissing-braces] struct rtable sch_frag_rt = { 0 }; ^ /kisskb/src/net/sched/sch_frag.c:93:10: warning: (near initialization for 'sch_frag_rt.dst') [-Wmissing-braces] /kisskb/src/fs/btrfs/tree-checker.c: In function 'check_root_item': /kisskb/src/fs/btrfs/tree-checker.c:1071:9: warning: missing braces around initializer [-Wmissing-braces] struct btrfs_root_item ri = { 0 }; ^ /kisskb/src/fs/btrfs/tree-checker.c:1071:9: warning: (near initialization for 'ri.inode') [-Wmissing-braces] /kisskb/src/fs/cifs/connect.c: In function 'cifs_mount': /kisskb/src/fs/cifs/connect.c:3466:2: warning: missing braces around initializer [-Wmissing-braces] uuid_t mount_id = {0}; ^ /kisskb/src/fs/cifs/connect.c:3466:2: warning: (near initialization for 'mount_id.b') [-Wmissing-braces] /kisskb/src/net/openvswitch/actions.c: In function 'ovs_fragment': /kisskb/src/net/openvswitch/actions.c:831:10: warning: missing braces around initializer [-Wmissing-braces] struct rtable ovs_rt = { 0 }; ^ /kisskb/src/net/openvswitch/actions.c:831:10: warning: (near initialization for 'ovs_rt.dst') [-Wmissing-braces] Completed OK # rm -rf /kisskb/build/linus_s390-defconfig_s390x-gcc4.9 # Build took: 0:02:35.640636