# git rev-parse -q --verify d077ee8b591d3961919f0322846a74dc7c6d3a64^{commit} d077ee8b591d3961919f0322846a74dc7c6d3a64 already have revision, skipping fetch # git checkout -q -f -B kisskb d077ee8b591d3961919f0322846a74dc7c6d3a64 # git clean -qxdf # < git log -1 # commit d077ee8b591d3961919f0322846a74dc7c6d3a64 # Author: Matthias Maennich # Date: Wed Dec 2 15:12:39 2020 +0000 # # scripts: merge_config: add strict mode to fail upon any redefinition # # When merging configuration fragments, it might be of interest to # identify mismatches (redefinitions) programmatically. Hence add the # option -s (strict mode) to instruct merge_config.sh to bail out in # case any redefinition has been detected. # # With strict mode, warnings are emitted as before, but the script # terminates with rc=1. If -y is set to define "builtin having # precedence over modules", fragments are still allowed to set =m (while # the base config has =y). Strict mode will tolerate that as demotions # from =y to =m are ignored when setting -y. # # Signed-off-by: Matthias Maennich # Reviewed-by: Lee Jones # Signed-off-by: Masahiro Yamada # < /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 d077ee8b591d3961919f0322846a74dc7c6d3a64 # < make -s -j 48 ARCH=s390 O=/kisskb/build/kbuild_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 48 ARCH=s390 O=/kisskb/build/kbuild_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 48 ARCH=s390 O=/kisskb/build/kbuild_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 48 ARCH=s390 O=/kisskb/build/kbuild_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/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/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/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/kbuild_s390-defconfig_s390x-gcc4.9 # Build took: 0:04:02.775805