# git rev-parse -q --verify a4a78bc8ead44c3cdb470c6e1f37afcabdddfc14^{commit} a4a78bc8ead44c3cdb470c6e1f37afcabdddfc14 already have revision, skipping fetch # git checkout -q -f -B kisskb a4a78bc8ead44c3cdb470c6e1f37afcabdddfc14 # git clean -qxdf # < git log -1 # commit a4a78bc8ead44c3cdb470c6e1f37afcabdddfc14 # Merge: ffc766b31e90 e3a606f2c544 # Author: Linus Torvalds # Date: Mon Apr 26 08:51:23 2021 -0700 # # Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 # # Pull crypto updates from Herbert Xu: # "API: # # - crypto_destroy_tfm now ignores errors as well as NULL pointers # # Algorithms: # # - Add explicit curve IDs in ECDH algorithm names # # - Add NIST P384 curve parameters # # - Add ECDSA # # Drivers: # # - Add support for Green Sardine in ccp # # - Add ecdh/curve25519 to hisilicon/hpre # # - Add support for AM64 in sa2ul" # # * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (184 commits) # fsverity: relax build time dependency on CRYPTO_SHA256 # fscrypt: relax Kconfig dependencies for crypto API algorithms # crypto: camellia - drop duplicate "depends on CRYPTO" # crypto: s5p-sss - consistently use local 'dev' variable in probe() # crypto: s5p-sss - remove unneeded local variable initialization # crypto: s5p-sss - simplify getting of_device_id match data # ccp: ccp - add support for Green Sardine # crypto: ccp - Make ccp_dev_suspend and ccp_dev_resume void functions # crypto: octeontx2 - add support for OcteonTX2 98xx CPT block. # crypto: chelsio/chcr - Remove useless MODULE_VERSION # crypto: ux500/cryp - Remove duplicate argument # crypto: chelsio - remove unused function # crypto: sa2ul - Add support for AM64 # crypto: sa2ul - Support for per channel coherency # dt-bindings: crypto: ti,sa2ul: Add new compatible for AM64 # crypto: hisilicon - enable new error types for QM # crypto: hisilicon - add new error type for SEC # crypto: hisilicon - support new error types for ZIP # crypto: hisilicon - dynamic configuration 'err_info' # crypto: doc - fix kernel-doc notation in chacha.c and af_alg.c # ... # < /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 a4a78bc8ead44c3cdb470c6e1f37afcabdddfc14 # < make -s -j 48 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 48 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 48 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 48 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:271: 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:116: scripts/mod/devicetable-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1234: prepare0] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 48 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:03.825085