# git rev-parse -q --verify 88bb507a74ea7d75fa49edd421eaa710a7d80598^{commit} 88bb507a74ea7d75fa49edd421eaa710a7d80598 already have revision, skipping fetch # git checkout -q -f -B kisskb 88bb507a74ea7d75fa49edd421eaa710a7d80598 # git clean -qxdf # < git log -1 # commit 88bb507a74ea7d75fa49edd421eaa710a7d80598 # Merge: 1048ba83fb1c ef357e02b6c4 # Author: Linus Torvalds # Date: Mon Feb 1 11:15:57 2021 -0800 # # Merge tag 'media/v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media # # Pull media fixes from Mauro Carvalho Chehab: # "The rockship rkisp1 driver will be promoted from staging in 5.11. # # While not too late, do a few uAPI changes which are needed to better # support its functionalities" # # * tag 'media/v5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: # media: rockchip: rkisp1: extend uapi array sizes # media: rockchip: rkisp1: carry ip version information # media: rockchip: rkisp1: reduce number of histogram grid elements in uapi # media: rkisp1: stats: mask the hist_bins values # media: rkisp1: stats: remove a wrong cast to u8 # media: rkisp1: uapi: change hist_bins array type from __u16 to __u32 # < /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 88bb507a74ea7d75fa49edd421eaa710a7d80598 # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7724_generic_defconfig # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7724_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 32 ARCH=sh O=/kisskb/build/linus_sh7724_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 32 ARCH=sh O=/kisskb/build/linus_sh7724_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:279: 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:1205: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7724_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_sh7724_generic_defconfig_sh4-gcc4.9 # Build took: 0:00:06.069331