# git rev-parse -q --verify c90aae022e641222b1f702fd0a0b2f9e709d03bc^{commit} c90aae022e641222b1f702fd0a0b2f9e709d03bc already have revision, skipping fetch # git checkout -q -f -B kisskb c90aae022e641222b1f702fd0a0b2f9e709d03bc # git clean -qxdf # < git log -1 # commit c90aae022e641222b1f702fd0a0b2f9e709d03bc # Merge: 9caeca80d64a f779c5c9fba0 # Author: Michael Ellerman # Date: Sun Feb 5 12:24:30 2023 +1100 # # Automatic merge of 'next-test' into merge-test (2023-02-05 12:24) # # 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 c90aae022e641222b1f702fd0a0b2f9e709d03bc # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_defconfig+NO_MEMORY_HOTPLUG_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_defconfig # Added to kconfig CONFIG_MEMORY_HOTPLUG=n # Added to kconfig CONFIG_MEMORY_HOTREMOVE=n # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_defconfig+NO_MEMORY_HOTPLUG_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_defconfig+NO_MEMORY_HOTPLUG_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_defconfig+NO_MEMORY_HOTPLUG_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-merge_pseries_defconfig+NO_MEMORY_HOTPLUG_powerpc-gcc5 # Build took: 0:02:31.264102