# git rev-parse -q --verify f8456690ba8eb18ea4714e68554e242a04f65cff^{commit} f8456690ba8eb18ea4714e68554e242a04f65cff already have revision, skipping fetch # git checkout -q -f -B kisskb f8456690ba8eb18ea4714e68554e242a04f65cff # git clean -qxdf # < git log -1 # commit f8456690ba8eb18ea4714e68554e242a04f65cff # Merge: 994e99a96c9b 1e7468bd9d30 # Author: Linus Torvalds # Date: Wed Jul 15 19:00:12 2020 -0700 # # Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux into master # # Pull clk fixes from Stephen Boyd: # "A couple build fixes for issues exposed this merge window and a fix # for the eMMC clk on AST2600 SoCs that fixes the rate that is # calculated by the clk framework" # # * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: # clk: Specify IOMEM dependency for HSDK pll driver # clk: AST2600: Add mux for EMMC clock # clk: mvebu: ARMADA_AP_CPU_CLK needs to select ARMADA_AP_CP_HELPER # < /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 f8456690ba8eb18ea4714e68554e242a04f65cff # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7710voipgw_defconfig # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_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_sh7710voipgw_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_sh7710voipgw_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 :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S:385: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S:388: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:17: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type return ioread8(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread8(void __iomem *); ^ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:18: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type return ioread16(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread16(void __iomem *); ^ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:18: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type return ioread32(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread32(void __iomem *); ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: kernel/sched/core.o: uses dsp instructions while previous modules use floating point instructions /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: kernel/sched/core.o: uses instructions which are incompatible with instructions used in previous modules /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: failed to merge target specific data of file kernel/sched/core.o make[1]: *** [/kisskb/src/Makefile:1139: vmlinux] Error 1 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_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_sh7710voipgw_defconfig_sh4-gcc4.9 # Build took: 0:00:32.748089