# git rev-parse -q --verify 5eb6eed7e0fe880dc8de8da203cc888716bbf196^{commit} 5eb6eed7e0fe880dc8de8da203cc888716bbf196 already have revision, skipping fetch # git checkout -q -f -B kisskb 5eb6eed7e0fe880dc8de8da203cc888716bbf196 # git clean -qxdf # < git log -1 # commit 5eb6eed7e0fe880dc8de8da203cc888716bbf196 # Merge: 8b5c6a3 591a033 # Author: Linus Torvalds # Date: Wed Jun 6 16:39:18 2018 -0700 # # Merge tag 'trace-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace # # Pull tracing updates from Steven Rostedt: # "One new feature was added to ftrace, which is the trace_marker now # supports triggers. For example: # # # cd /sys/kernel/debug/tracing # # echo 'snapshot' > events/ftrace/print/trigger # # echo 'cause snapshot' > trace_marker # # The rest of the changes are various clean ups and also one stable fix # that was added late in the cycle" # # * tag 'trace-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (21 commits) # tracing: Use match_string() instead of open coding it in trace_set_options() # branch-check: fix long->int truncation when profiling branches # ring-buffer: Fix typo in comment # ring-buffer: Fix a bunch of typos in comments # tracing/selftest: Add test to test simple snapshot trigger for trace_marker # tracing/selftest: Add test to test hist trigger between kernel event and trace_marker # tracing/selftest: Add selftests to test trace_marker histogram triggers # ftrace/selftest: Fix reset_trigger() to handle triggers with filters # ftrace/selftest: Have the reset_trigger code be a bit more careful # tracing: Document trace_marker triggers # tracing: Allow histogram triggers to access ftrace internal events # tracing: Prevent further users of zero size static arrays in trace events # tracing: Have zero size length in filter logic be full string # tracing: Add trigger file for trace_markers tracefs/ftrace/print # tracing: Do not show filter file for ftrace internal events # tracing: Add brackets in ftrace event dynamic arrays # tracing: Have event_trace_init() called by trace_init_tracefs() # tracing: Add __find_event_file() to find event files without restrictions # tracing: Do not reference event data in post call triggers # tracepoints: Fix the descriptions of tracepoint_probe_register{_prio} # ... # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < git log --format=%s --max-count=1 5eb6eed7e0fe880dc8de8da203cc888716bbf196 # < make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig # yes \n | make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- :1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp] /kisskb/src/drivers/input/joystick/analog.c:176:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ /kisskb/src/drivers/md/md.c: In function 'mddev_put': /kisskb/src/drivers/md/md.c:543:1: warning: the frame size of 1104 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/spi/spi-sh-msiof.c:77:0: warning: "STR" redefined #define STR 0x40 /* Status Register */ ^ In file included from /kisskb/src/arch/mips/include/asm/mach-generic/spaces.h:15:0, from /kisskb/src/arch/mips/include/asm/addrspace.h:13, from /kisskb/src/arch/mips/include/asm/barrier.h:11, from /kisskb/src/include/linux/compiler.h:245, from /kisskb/src/arch/mips/include/asm/bitops.h:16, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/bitmap.h:8, from /kisskb/src/drivers/spi/spi-sh-msiof.c:14: /kisskb/src/arch/mips/include/asm/mipsregs.h:29:0: note: this is the location of the previous definition #define STR(x) __STR(x) ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:41:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:274:0: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:40:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:405:0: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:41:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:275:0: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:40:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:406:0: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) ^ FIT description: Linux 4.17.0+ Created: Thu Jun 7 15:31:54 2018 Image 0 (kernel@0) Description: Linux 4.17.0+ Created: Thu Jun 7 15:31:54 2018 Type: Kernel Image Compression: gzip compressed Data Size: 5672734 Bytes = 5539.78 kB = 5.41 MB Architecture: MIPS OS: Linux Load Address: 0x84000000 Entry Point: 0x84903240 Hash algo: sha1 Hash value: 51bb0d8c1371c962153fbadfe8ffee73e2490ccd Image 1 (fdt@boston) Description: img,boston Device Tree Created: Thu Jun 7 15:31:54 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 3668 Bytes = 3.58 kB = 0.00 MB Architecture: MIPS Hash algo: sha1 Hash value: 569c37cc891ce1e1f3a193cb41cc691a5d2debb5 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Thu Jun 7 15:31:54 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 kB = 0.00 MB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Thu Jun 7 15:31:54 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 kB = 0.00 MB Architecture: MIPS Hash algo: sha1 Hash value: 509ce58e44c561d54539e64e9d4b47054e696fc6 Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-allmodconfig_mipsel # Build took: 0:22:58.351373