# git rev-parse -q --verify 4d66020dcef83314092f2c8c89152a8d122627e2^{commit} 4d66020dcef83314092f2c8c89152a8d122627e2 already have revision, skipping fetch # git checkout -q -f -B kisskb 4d66020dcef83314092f2c8c89152a8d122627e2 # git clean -qxdf # < git log -1 # commit 4d66020dcef83314092f2c8c89152a8d122627e2 # Merge: 77dbd72b982c f37c3bbc6359 # Author: Linus Torvalds # Date: Sun Jan 16 10:15:32 2022 +0200 # # Merge tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace # # Pull tracing updates from Steven Rostedt: # "New: # # - The Real Time Linux Analysis (RTLA) tool is added to the tools # directory. # # - Can safely filter on user space pointers with: field.ustring ~ # "match-string" # # - eprobes can now be filtered like any other event. # # - trace_marker(_raw) now uses stream_open() to allow multiple threads # to safely write to it. Note, this could possibly break existing # user space, but we will not know until we hear about it, and then # can revert the change if need be. # # - New field in events to display when bottom halfs are disabled. # # - Sorting of the ftrace functions are now done at compile time # instead of at bootup. # # Infrastructure changes to support future efforts: # # - Added __rel_loc type for trace events. Similar to __data_loc but # the offset to the dynamic data is based off of the location of the # descriptor and not the beginning of the event. Needed for user # defined events. # # - Some simplification of event trigger code. # # - Make synthetic events process its callback better to not hinder # other event callbacks that are registered. Needed for user defined # events. # # And other small fixes and cleanups" # # * tag 'trace-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (50 commits) # tracing: Add ustring operation to filtering string pointers # rtla: Add rtla timerlat hist documentation # rtla: Add rtla timerlat top documentation # rtla: Add rtla timerlat documentation # rtla: Add rtla osnoise hist documentation # rtla: Add rtla osnoise top documentation # rtla: Add rtla osnoise man page # rtla: Add Documentation # rtla/timerlat: Add timerlat hist mode # rtla: Add timerlat tool and timelart top mode # rtla/osnoise: Add the hist mode # rtla/osnoise: Add osnoise top mode # rtla: Add osnoise tool # rtla: Helper functions for rtla # rtla: Real-Time Linux Analysis tool # tracing/osnoise: Properly unhook events if start_per_cpu_kthreads() fails # tracing: Remove duplicate warnings when calling trace_create_file() # tracing/kprobes: 'nmissed' not showed correctly for kretprobe # tracing: Add test for user space strings when filtering on string pointers # tracing: Have syscall trace events use trace_event_buffer_lock_reserve() # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 4d66020dcef83314092f2c8c89152a8d122627e2 # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-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 # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:13477:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" /kisskb/src/arch/mips/boot/dts/ingenic/jz4780.dtsi:513.33-515.6: Warning (unit_address_format): /nemc@13410000/efuse@d0/eth-mac-addr@0x22: unit name should not have leading "0x" In file included from /kisskb/src/sound/pci/ca0106/ca0106_main.c:156: /kisskb/src/sound/pci/ca0106/ca0106.h:62: error: "PTR" redefined [-Werror] #define PTR 0x00 /* Indexed register set pointer register */ In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/log2.h:12, from /kisskb/src/include/asm-generic/div64.h:55, from /kisskb/src/arch/mips/include/asm/div64.h:89, from /kisskb/src/include/linux/math.h:5, from /kisskb/src/include/linux/delay.h:22, from /kisskb/src/sound/pci/ca0106/ca0106_main.c:124: /kisskb/src/arch/mips/include/asm/asm.h:288: note: this is the location of the previous definition #define PTR .word cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:288: sound/pci/ca0106/ca0106_main.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:550: sound/pci/ca0106] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:550: sound/pci] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1840: sound] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/lib/test_printf.c:247: error: "PTR" redefined [-Werror] #define PTR ((void *)0x456789ab) In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/kernel.h:13, from /kisskb/src/lib/test_printf.c:9: /kisskb/src/arch/mips/include/asm/asm.h:288: note: this is the location of the previous definition #define PTR .word cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:288: lib/test_printf.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1840: lib] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:29:10.889085