# git rev-parse -q --verify adc12a7407b28c0f257227a508db83ab00911b74^{commit} adc12a7407b28c0f257227a508db83ab00911b74 already have revision, skipping fetch # git checkout -q -f -B kisskb adc12a7407b28c0f257227a508db83ab00911b74 # git clean -qxdf # < git log -1 # commit adc12a7407b28c0f257227a508db83ab00911b74 # Merge: d1e7c13a9b0c 860dafa90259 # Author: Linus Torvalds # Date: Thu May 13 11:12:51 2021 -0700 # # Merge branch 'resizex' (patches from Maciej) # # Merge VT_RESIZEX fixes from Maciej Rozycki: # "I got to the bottom of the issue with VT_RESIZEX recently discussed # and came up with this small patch series, fixing an additional issue # that I originally thought might be broken VGA hardware emulation with # my laptop, which however turned out to be intertwined with the # original problem and also a regression introduced somewhat later. # # The fix for that because the first patch, and then to make backporting # feasible I had to put a revert of the offending change from last # September next, followed by a proper fix for the framebuffer issue # that change had tried to address. # # See individual change descriptions for details. # # These have been verified with true VGA hardware (a Trident TVGA8900 # ISA video adapter) using various combinations of `svgatextmode' and # `setfont' command invocations to change both the VT size and the font # size, and also switching between the text console and X11, both by # starting/stopping the X server and by switching between VTs. # # All this to ensure bringing the behaviour of VGA text console back to # correct operation as it used to be with Linux 2.6.18" # # * emailed patches from Maciej W. Rozycki : # vt: Fix character height handling with VT_RESIZEX # vt_ioctl: Revert VT_RESIZEX parameter handling removal # vgacon: Record video mode changes with VT_RESIZEX # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 adc12a7407b28c0f257227a508db83ab00911b74 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 120 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 120 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4569:warning: override: reassigning to symbol PPC64 .config:4570:warning: override: reassigning to symbol PPC_DISABLE_WERROR .config:4571:warning: override: reassigning to symbol SECTION_MISMATCH_WARN_ONLY .config:4572:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD .config:4577:warning: override: reassigning to symbol UBSAN # make -s -j 120 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-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/drivers/clk/xilinx/xlnx_vcu.c: In function 'xvcu_register_clock_provider': /kisskb/src/drivers/clk/xilinx/xlnx_vcu.c:524:9: warning: missing braces around initializer [-Wmissing-braces] struct clk_parent_data parent_data[2] = { 0 }; ^ /kisskb/src/drivers/clk/xilinx/xlnx_vcu.c:524:9: warning: (near initialization for 'parent_data[0]') [-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] Completed OK # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 # Build took: 0:04:09.098176