# git rev-parse -q --verify 09a0972ac14f67d600aa3c80035367a8074e90eb^{commit} 09a0972ac14f67d600aa3c80035367a8074e90eb already have revision, skipping fetch # git checkout -q -f -B kisskb 09a0972ac14f67d600aa3c80035367a8074e90eb # git clean -qxdf # < git log -1 # commit 09a0972ac14f67d600aa3c80035367a8074e90eb # Author: Michael Ellerman # Date: Mon Nov 2 12:56:29 2020 +1100 # # powerpc/mm: Reorder variables to match master # # The conflict resolution in this code was done slightly differently # between merge and master, fix up merge to match what is in master now. # # Signed-off-by: Michael Ellerman # < /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 09a0972ac14f67d600aa3c80035367a8074e90eb # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc86xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc86xx_defconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc86xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- cc1: fatal error: opening output file arch/powerpc/boot/dts/fsl/.mvme7100.dtb.dts.tmp: No such file or directory compilation terminated. make[2]: *** [scripts/Makefile.lib:326: arch/powerpc/boot/dts/fsl/mvme7100.dtb] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/powerpc/Makefile:295: zImage] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc86xx_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_mpc86xx_defconfig_powerpc-gcc5 # Build took: 0:01:08.522588