# git rev-parse -q --verify 1434a3127887a7e708be5f4edd5e36d64d8622f8^{commit} 1434a3127887a7e708be5f4edd5e36d64d8622f8 already have revision, skipping fetch # git checkout -q -f -B kisskb 1434a3127887a7e708be5f4edd5e36d64d8622f8 # git clean -qxdf # < git log -1 # commit 1434a3127887a7e708be5f4edd5e36d64d8622f8 # Merge: 5df7ae7bed41 08b2b6fdf6b2 # Author: Linus Torvalds # Date: Mon May 24 07:46:31 2021 -1000 # # Merge branch 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup # # Pull cgroup fixes from Tejun Heo: # # - "cgroup_disable=" boot param was being applied too late confusing # some subsystems. Fix it by moving application to __setup() time. # # - Comment spelling fixes. Included here to lower the chance of trivial # future merge conflicts. # # * 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: # cgroup: fix spelling mistakes # cgroup: disable controllers at parse time # < /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 1434a3127887a7e708be5f4edd5e36d64d8622f8 # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7770_generic_defconfig # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7770_generic_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:272: 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:1226: prepare0] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7770_generic_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_sh7770_generic_defconfig_sh4-gcc4.9 # Build took: 0:00:04.811609