# git rev-parse -q --verify 3b9672fff747b31a2204003cab9fe082321edc1b^{commit} 3b9672fff747b31a2204003cab9fe082321edc1b already have revision, skipping fetch # git checkout -q -f -B kisskb 3b9672fff747b31a2204003cab9fe082321edc1b # git clean -qxdf # < git log -1 # commit 3b9672fff747b31a2204003cab9fe082321edc1b # Merge: e901378578c6 b6ae3550c8e2 # Author: Michael Ellerman # Date: Mon Oct 29 22:31:51 2018 +1100 # # Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next # # Updates from Scott: # "This contains a couple device tree updates, and a fix for a missing # prototype warning." # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 3b9672fff747b31a2204003cab9fe082321edc1b # < make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-next_corenet64_smp_defconfig+KVM_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- corenet64_smp_defconfig # Added to kconfig CONFIG_KVM_E500MC=y # Added to kconfig CONFIG_VIRTUALIZATION=y # Added to kconfig CONFIG_KVM_MPIC=y # yes \n | make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-next_corenet64_smp_defconfig+KVM_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- oldconfig yes: standard output: Broken pipe # make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-next_corenet64_smp_defconfig+KVM_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/arch/powerpc/kvm/powerpc.c:51:0: /kisskb/src/arch/powerpc/kvm/trace.h:9:0: error: "TRACE_INCLUDE_PATH" redefined [-Werror] #define TRACE_INCLUDE_PATH . ^ In file included from /kisskb/src/arch/powerpc/kvm/../mm/mmu_decl.h:25:0, from /kisskb/src/arch/powerpc/kvm/powerpc.c:48: /kisskb/src/arch/powerpc/include/asm/trace.h:224:0: note: this is the location of the previous definition #define TRACE_INCLUDE_PATH asm ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:305: arch/powerpc/kvm/powerpc.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:546: arch/powerpc/kvm] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1060: arch/powerpc] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:146: sub-make] Error 2 Command 'make -s -j 80 ARCH=powerpc O=/kisskb/build/powerpc-next_corenet64_smp_defconfig+KVM_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-next_corenet64_smp_defconfig+KVM_powerpc-gcc5 # Build took: 0:01:15.036829