# git rev-parse -q --verify 39a77db53cca8200b8bc99fc0993e127b59f08fb^{commit} 39a77db53cca8200b8bc99fc0993e127b59f08fb already have revision, skipping fetch # git checkout -q -f -B kisskb 39a77db53cca8200b8bc99fc0993e127b59f08fb # git clean -qxdf # < git log -1 # commit 39a77db53cca8200b8bc99fc0993e127b59f08fb # Merge: c219e8e62770 3ce47d95b734 # Author: Michael Ellerman # Date: Thu Jan 7 17:44:20 2021 +1100 # # Automatic merge of 'fixes' into merge (2021-01-07 17:43) # # Conflicts: # arch/powerpc/kernel/head_book3s_32.S # < /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 39a77db53cca8200b8bc99fc0993e127b59f08fb # < make -s -j 8 ARCH=powerpc O=/kisskb/build/powerpc-merge_ps3_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ps3_defconfig # < make -s -j 8 ARCH=powerpc O=/kisskb/build/powerpc-merge_ps3_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 8 ARCH=powerpc O=/kisskb/build/powerpc-merge_ps3_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 8 ARCH=powerpc O=/kisskb/build/powerpc-merge_ps3_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 00000b0c R_PPC_REL24 _restgpr_31_x arch/powerpc/kernel/vdso32/vdso32.so.dbg: dynamic relocations are not supported make[2]: *** [/kisskb/src/arch/powerpc/kernel/vdso32/Makefile:54: arch/powerpc/kernel/vdso32/vdso32.so.dbg] Error 1 make[1]: *** [arch/powerpc/Makefile:425: vdso_prepare] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 8 ARCH=powerpc O=/kisskb/build/powerpc-merge_ps3_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-merge_ps3_defconfig_powerpc-gcc5 # Build took: 0:00:07.014079