# git rev-parse -q --verify 09a0972ac14f67d600aa3c80035367a8074e90eb^{commit}
# git fetch -q -n -f git://gitlab.ozlabs.ibm.com/linuxppc/linux.git merge
warning: The last gc run reported the following. Please correct the root cause
and remove .git/gc.log.
Automatic cleanup will not be performed until the file is removed.

warning: There are too many unreachable loose objects; run 'git prune' to remove them.

# git rev-parse -q --verify 09a0972ac14f67d600aa3c80035367a8074e90eb^{commit}
09a0972ac14f67d600aa3c80035367a8074e90eb
# 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/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version
# < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version
# < git log --format=%s --max-count=1 09a0972ac14f67d600aa3c80035367a8074e90eb
# < make -s -j 120 ARCH=mips O=/kisskb/build/powerpc-merge_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-  defconfig
# make -s -j 120 ARCH=mips O=/kisskb/build/powerpc-merge_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-  
FIT description: Linux 5.10.0-rc2-g09a0972ac14f
Created:         Tue Nov  3 00:57:22 2020
 Image 0 (kernel@0)
  Description:  Linux 5.10.0-rc2-g09a0972ac14f
  Created:      Tue Nov  3 00:57:22 2020
  Type:         Kernel Image
  Compression:  gzip compressed
  Data Size:    5173746 Bytes = 5052.49 KiB = 4.93 MiB
  Architecture: MIPS
  OS:           Linux
  Load Address: 0x80100000
  Entry Point:  0x80982f78
  Hash algo:    sha1
  Hash value:   6aebf0707d8eec0472b300dd92ab012d23e29f8d
 Image 1 (fdt@boston)
  Description:  img,boston Device Tree
  Created:      Tue Nov  3 00:57:22 2020
  Type:         Flat Device Tree
  Compression:  uncompressed
  Data Size:    3793 Bytes = 3.70 KiB = 0.00 MiB
  Architecture: MIPS
  Hash algo:    sha1
  Hash value:   4799f50d688573234da6e9d7701234d394759ef4
 Image 2 (fdt@ni169445)
  Description:  NI 169445 device tree
  Created:      Tue Nov  3 00:57:22 2020
  Type:         Flat Device Tree
  Compression:  uncompressed
  Data Size:    1871 Bytes = 1.83 KiB = 0.00 MiB
  Architecture: MIPS
  Hash algo:    sha1
  Hash value:   51b89b31605ee62038c8468c429af091dfc75ec7
 Image 3 (fdt@ocelot_pcb123)
  Description:  MSCC Ocelot PCB123 Device Tree
  Created:      Tue Nov  3 00:57:22 2020
  Type:         Flat Device Tree
  Compression:  uncompressed
  Data Size:    4659 Bytes = 4.55 KiB = 0.00 MiB
  Architecture: MIPS
  Hash algo:    sha1
  Hash value:   5bcb6e4f21e8e5372544aa130b3bd097355a9050
 Image 4 (fdt@ocelot_pcb120)
  Description:  MSCC Ocelot PCB120 Device Tree
  Created:      Tue Nov  3 00:57:22 2020
  Type:         Flat Device Tree
  Compression:  uncompressed
  Data Size:    5418 Bytes = 5.29 KiB = 0.01 MiB
  Architecture: MIPS
  Hash algo:    sha1
  Hash value:   93d882f2009a217e0fa9dab94788535ed2be8476
 Image 5 (fdt@xilfpga)
  Description:  MIPSfpga (xilfpga) Device Tree
  Created:      Tue Nov  3 00:57:22 2020
  Type:         Flat Device Tree
  Compression:  uncompressed
  Data Size:    2708 Bytes = 2.64 KiB = 0.00 MiB
  Architecture: MIPS
  Hash algo:    sha1
  Hash value:   63d058b780f65e22da30f0a183433765f1807f1d
 Default Configuration: 'conf@default'
 Configuration 0 (conf@default)
  Description:  Generic Linux kernel
  Kernel:       kernel@0
 Configuration 1 (conf@boston)
  Description:  Boston Linux kernel
  Kernel:       kernel@0
  FDT:          fdt@boston
 Configuration 2 (conf@ni169445)
  Description:  NI 169445 Linux Kernel
  Kernel:       kernel@0
  FDT:          fdt@ni169445
 Configuration 3 (conf@ocelot_pcb123)
  Description:  Ocelot Linux kernel
  Kernel:       kernel@0
  FDT:          fdt@ocelot_pcb123
 Configuration 4 (conf@ocelot_pcb120)
  Description:  Ocelot Linux kernel
  Kernel:       kernel@0
  FDT:          fdt@ocelot_pcb120
 Configuration 5 (conf@xilfpga)
  Description:  MIPSfpga Linux kernel
  Kernel:       kernel@0
  FDT:          fdt@xilfpga
Completed OK
# rm -rf /kisskb/build/powerpc-merge_mips-defconfig_mipsel
# Build took: 0:01:18.589068