# git rev-parse -q --verify 16332b7fbbe46581ddac80c6d32834c1269bc450^{commit} # git fetch -q -n -f git://gitlab.ozlabs.ibm.com/linuxppc/linux.git merge # git rev-parse -q --verify 16332b7fbbe46581ddac80c6d32834c1269bc450^{commit} 16332b7fbbe46581ddac80c6d32834c1269bc450 # git checkout -q -f -B kisskb 16332b7fbbe46581ddac80c6d32834c1269bc450 # git clean -qxdf # < git log -1 # commit 16332b7fbbe46581ddac80c6d32834c1269bc450 # Merge: d00a4de41697 6112bd00e84e # Author: Michael Ellerman # Date: Sun May 29 10:33:27 2022 +1000 # # Automatic merge of 'master' into merge (2022-05-29 10:31) # # Conflicts: # arch/powerpc/Kconfig # < /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 16332b7fbbe46581ddac80c6d32834c1269bc450 # < make -s -j 120 ARCH=m68k O=/kisskb/build/powerpc-merge_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- defconfig arch/m68k/configs/multi_defconfig:61:warning: symbol value 'm' invalid for ZPOOL # < make -s -j 120 ARCH=m68k O=/kisskb/build/powerpc-merge_m68k-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/powerpc-merge_m68k-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/powerpc-merge_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- Completed OK # rm -rf /kisskb/build/powerpc-merge_m68k-defconfig_m68k-gcc8 # Build took: 0:01:13.835540