# 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-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version
# < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version
# < git log --format=%s --max-count=1 09a0972ac14f67d600aa3c80035367a8074e90eb
# < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_40x_obs600_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-  40x/obs600_defconfig
# < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_40x_obs600_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-  help
# make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_40x_obs600_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-  olddefconfig
# make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_40x_obs600_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-  
/kisskb/src/block/genhd.c: In function 'diskstats_show':
/kisskb/src/block/genhd.c:1659:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=]
 }
 ^
INFO: Uncompressed kernel (size 0x558a84) overlaps the address of the wrapper(0x400000)
INFO: Fixing the link_address of wrapper to (0x600000)
Image Name:   Linux-5.10.0-rc2-g09a0972ac14f
Created:      Tue Nov  3 01:54:49 2020
Image Type:   PowerPC Linux Multi-File Image (gzip compressed)
Data Size:    2728474 Bytes = 2664.53 KiB = 2.60 MiB
Load Address: 00000000
Entry Point:  00000000
Contents:
   Image 0: 2721586 Bytes = 2657.80 KiB = 2.60 MiB
   Image 1: 2 Bytes = 0.00 KiB = 0.00 MiB
   Image 2: 6866 Bytes = 6.71 KiB = 0.01 MiB
Completed OK
# rm -rf /kisskb/build/powerpc-merge_40x_obs600_defconfig_powerpc-gcc4.9
# Build took: 0:00:53.636360