# git rev-parse -q --verify 16332b7fbbe46581ddac80c6d32834c1269bc450^{commit} # git fetch -q -n -f git://gitlab.ozlabs.ibm.com/linuxppc/linux.git merge 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 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-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 16332b7fbbe46581ddac80c6d32834c1269bc450 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_maple_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- maple_defconfig # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_maple_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_maple_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_maple_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-merge_maple_defconfig_powerpc-gcc5 # Build took: 0:02:13.131187