# git rev-parse -q --verify 06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd^{commit} 06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd already have revision, skipping fetch # git checkout -q -f -B kisskb 06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd # git clean -qxdf # < git log -1 # commit 06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd # Merge: 4cf7562190c7 5a4fe0624687 # Author: Linus Torvalds # Date: Mon Aug 17 17:15:23 2020 -0700 # # Merge tag 'pstore-v5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux # # Pull mailmap update from Kees Cook: # "This was originally part of my pstore tree, but when I realized that # mailmap needed re-alphabetizing, I decided to wait until -rc1 to send # this, as I saw a lot of mailmap additions pending in -next for the # merge window. # # It's a programmatic reordering and the addition of a pstore # contributor's preferred email address" # # * tag 'pstore-v5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: # mailmap: Add WeiXiong Liao # mailmap: Restore dictionary sorting # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd # < make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7785lcr_32bit_defconfig # < make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:283: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:117: scripts/mod/devicetable-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1202: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 # Build took: 0:00:06.129160