# git rev-parse -q --verify a04f372ecabe93f80d4081557703fa3cd5122bd0^{commit} a04f372ecabe93f80d4081557703fa3cd5122bd0 already have revision, skipping fetch # git checkout -q -f -B kisskb a04f372ecabe93f80d4081557703fa3cd5122bd0 # git clean -qxdf # < git log -1 # commit a04f372ecabe93f80d4081557703fa3cd5122bd0 # Merge: 9783f0305d18 9ffcf6a19dbb # Author: Michael Ellerman # Date: Wed Feb 1 21:28:01 2023 +1100 # # Automatic merge of 'next-test' into merge-test (2023-02-01 21:25) # # Conflicts: # arch/powerpc/kexec/file_load_64.c # < /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 a04f372ecabe93f80d4081557703fa3cd5122bd0 # < make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # < make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- arch/powerpc/platforms/chrp/pci.o: In function `chrp_find_bridges': /kisskb/src/arch/powerpc/platforms/chrp/pci.c:323: undefined reference to `pci_create_OF_bus_map' make[2]: *** [/kisskb/src/scripts/Makefile.vmlinux:35: vmlinux] Error 1 make[1]: *** [/kisskb/src/Makefile:1264: vmlinux] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:242: __sub-make] Error 2 Command 'make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_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_ppc6xx_defconfig_powerpc-gcc5 # Build took: 0:02:51.056612