# git rev-parse -q --verify 09a0972ac14f67d600aa3c80035367a8074e90eb^{commit}
09a0972ac14f67d600aa3c80035367a8074e90eb
already have revision, skipping fetch
# git checkout -q -f -B kisskb 09a0972ac14f67d600aa3c80035367a8074e90eb
# git clean -qxdf
# < git log -1
# commit 09a0972ac14f67d600aa3c80035367a8074e90eb
# Author: Michael Ellerman <mpe@ellerman.id.au>
# Date:   Mon Nov 2 12:56:29 2020 +1100
# 
#     powerpc/mm: Reorder variables to match master
#     
#     The conflict resolution in this code was done slightly differently
#     between merge and master, fix up merge to match what is in master now.
#     
#     Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
# < /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 09a0972ac14f67d600aa3c80035367a8074e90eb
# < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_le_defconfig+NO_NUMA_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-  pseries_le_defconfig
# Added to kconfig CONFIG_NUMA=n
# yes \n | make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_le_defconfig+NO_NUMA_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 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_le_defconfig+NO_NUMA_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-  
arch/powerpc/platforms/pseries/hotplug-memory.o: In function `dlpar_add_lmb':
hotplug-memory.c:(.text+0x5e0): undefined reference to `of_drconf_to_nid_single'
make[1]: *** [/kisskb/src/Makefile:1164: vmlinux] Error 1
make: *** [Makefile:185: __sub-make] Error 2
Command 'make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_le_defconfig+NO_NUMA_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_pseries_le_defconfig+NO_NUMA_powerpc-gcc5
# Build took: 0:01:37.109625