# 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-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 a04f372ecabe93f80d4081557703fa3cd5122bd0 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pmac32_defconfig+SMP_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pmac32_defconfig # Added to kconfig CONFIG_SMP=y # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pmac32_defconfig+SMP_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pmac32_defconfig+SMP_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4446:warning: override: reassigning to symbol SMP # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pmac32_defconfig+SMP_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-merge_pmac32_defconfig+SMP_powerpc-gcc12 # Build took: 0:01:51.894695