# git rev-parse -q --verify 14f6db7ef1d167a6f8e172d24ee5f682afebd44c^{commit} # git fetch -q -n -f git://gitlab.ozlabs.ibm.com/linuxppc/linux.git merge # git rev-parse -q --verify 14f6db7ef1d167a6f8e172d24ee5f682afebd44c^{commit} 14f6db7ef1d167a6f8e172d24ee5f682afebd44c # git checkout -q -f -B kisskb 14f6db7ef1d167a6f8e172d24ee5f682afebd44c # git clean -qxdf # < git log -1 # commit 14f6db7ef1d167a6f8e172d24ee5f682afebd44c # Merge: 69e854d5e8fd 1e688dd2a3d6 # Author: Michael Ellerman # Date: Wed Aug 18 23:55:37 2021 +1000 # # Automatic merge of 'next' into merge (2021-08-18 23:55) # # Conflicts: # arch/powerpc/sysdev/xive/common.c # < /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 14f6db7ef1d167a6f8e172d24ee5f682afebd44c # < make -s -j 32 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 32 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- help # make -s -j 32 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- olddefconfig # make -s -j 32 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- Completed OK # rm -rf /kisskb/build/powerpc-merge_mips-defconfig_mipsel # Build took: 0:02:17.647833