# 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 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_amigaone_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-  amigaone_defconfig
# < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_amigaone_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-  help
# make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_amigaone_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-  olddefconfig
# make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_amigaone_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-  
INFO: Uncompressed kernel (size 0x71e2c8) overlaps the address of the wrapper(0x400000)
INFO: Fixing the link_address of wrapper to (0x800000)
Image Name:   Linux-5.10.0-rc2+
Created:      Tue Nov  3 01:29:35 2020
Image Type:   PowerPC Linux Kernel Image (gzip compressed)
Data Size:    3338447 Bytes = 3260.20 KiB = 3.18 MiB
Load Address: 00800000
Entry Point:  00800144
Image Name:   Linux-5.10.0-rc2+
Created:      Tue Nov  3 01:29:35 2020
Image Type:   PowerPC Linux Kernel Image (gzip compressed)
Data Size:    3310365 Bytes = 3232.78 KiB = 3.16 MiB
Load Address: 00000000
Entry Point:  00000000
Completed OK
# rm -rf /kisskb/build/powerpc-merge_amigaone_defconfig_powerpc-gcc5
# Build took: 0:00:53.418200