# git rev-parse -q --verify adc12a7407b28c0f257227a508db83ab00911b74^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master warning: The last gc run reported the following. Please correct the root cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. warning: There are too many unreachable loose objects; run 'git prune' to remove them. # git rev-parse -q --verify adc12a7407b28c0f257227a508db83ab00911b74^{commit} adc12a7407b28c0f257227a508db83ab00911b74 # 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-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 adc12a7407b28c0f257227a508db83ab00911b74 # < make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- randconfig # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # < make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig # make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- Completed OK # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 # Build took: 0:04:25.836860