# git rev-parse -q --verify d1e521adad250ab8c979861c857fa2b1542c9741^{commit} d1e521adad250ab8c979861c857fa2b1542c9741 already have revision, skipping fetch # git checkout -q -f -B kisskb d1e521adad250ab8c979861c857fa2b1542c9741 # git clean -qxdf # < git log -1 # commit d1e521adad250ab8c979861c857fa2b1542c9741 # Merge: 595a56ac1b0d 388d8bdb87e0 # Author: Linus Torvalds # Date: Tue Jun 9 10:06:18 2020 -0700 # # Merge tag 'trace-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace # # Pull tracing updates from Steven Rostedt: # "No new features this release. Mostly clean ups, restructuring and # documentation. # # - Have ftrace_bug() show ftrace errors before the WARN, as the WARN # will reboot the box before the error messages are printed if # panic_on_warn is set. # # - Have traceoff_on_warn disable tracing sooner (before prints) # # - Write a message to the trace buffer that its being disabled when # disable_trace_on_warning() is set. # # - Separate out synthetic events from histogram code to let it be used # by other parts of the kernel. # # - More documentation on histogram design. # # - Other small fixes and clean ups" # # * tag 'trace-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: # tracing: Remove obsolete PREEMPTIRQ_EVENTS kconfig option # tracing/doc: Fix ascii-art in histogram-design.rst # tracing: Add a trace print when traceoff_on_warning is triggered # ftrace,bug: Improve traceoff_on_warn # selftests/ftrace: Distinguish between hist and synthetic event checks # tracing: Move synthetic events to a separate file # tracing: Fix events.rst section numbering # tracing/doc: Fix typos in histogram-design.rst # tracing: Add hist_debug trace event files for histogram debugging # tracing: Add histogram-design document # tracing: Check state.disabled in synth event trace functions # tracing/probe: reverse arguments to list_add # tools/bootconfig: Add a summary of test cases and return error # ftrace: show debugging information when panic_on_warn set # < /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 d1e521adad250ab8c979861c857fa2b1542c9741 # < make -s -j 80 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 80 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 80 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 80 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:1152: vmlinux] Error 1 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 80 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.877764