# git rev-parse -q --verify a1d4aa500bfb93c4ea6eb9a3c5c9cb6720ed8f46^{commit} a1d4aa500bfb93c4ea6eb9a3c5c9cb6720ed8f46 already have revision, skipping fetch # git checkout -q -f -B kisskb a1d4aa500bfb93c4ea6eb9a3c5c9cb6720ed8f46 # git clean -qxdf # < git log -1 # commit a1d4aa500bfb93c4ea6eb9a3c5c9cb6720ed8f46 # Merge: dbec59493c5c c15d1f9d03a0 # Author: Michael Ellerman # Date: Tue Dec 15 23:51:28 2020 +1100 # # Automatic merge of 'next' into merge (2020-12-15 23:50) # # Conflicts: # arch/powerpc/configs/disable-werror.config # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 a1d4aa500bfb93c4ea6eb9a3c5c9cb6720ed8f46 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc86xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc86xx_defconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc86xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/block/genhd.c: In function 'diskstats_show': /kisskb/src/block/genhd.c:1662:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/zstd/compress.c: In function 'ZSTD_compressBlock_doubleFast': /kisskb/src/lib/zstd/compress.c:1393:1: warning: the frame size of 1584 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ 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:293: zImage] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc86xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-merge_mpc86xx_defconfig_powerpc-gcc4.9 # Build took: 0:01:07.981597