# 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 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_powernv_defconfig+NO_NUMA_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- powernv_defconfig # Added to kconfig CONFIG_NUMA=n # < make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_powernv_defconfig+NO_NUMA_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_powernv_defconfig+NO_NUMA_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_powernv_defconfig+NO_NUMA_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/arch/powerpc/kexec/file_load_64.c: In function 'kexec_extra_fdt_size_ppc64': /kisskb/src/arch/powerpc/kexec/file_load_64.c:998:33: error: implicit declaration of function 'memory_hotplug_max' [-Werror=implicit-function-declaration] 998 | usm_entries = ((memory_hotplug_max() / drmem_lmb_size()) + | ^~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:252: arch/powerpc/kexec/file_load_64.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:504: arch/powerpc/kexec] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:504: arch/powerpc] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:2021: .] Error 2 make: *** [Makefile:242: __sub-make] Error 2 Command 'make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_powernv_defconfig+NO_NUMA_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-merge_powernv_defconfig+NO_NUMA_powerpc-gcc12 # Build took: 0:01:43.657100