Linux / linux / 2f13437 / Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Linux/linux 2f13437 — include/trace trace_events.h, kernel/trace trace_events_inject.c trace.c

2019-12-05 03:13:52 UTC by Linus Torvalds on ⎇

master

Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull more tracing updates from Steven Rostedt:
 "Two fixes and one patch that was missed:

  Fixes:

   - Missing __print_hex_dump undef for processing new function in trace
     events

   - Stop WARN_ON messages when lockdown disables tracing on boot up

  Enhancement:

   - Debug option to inject trace events from userspace (for rasdaemon)"

The enhancement has its own config option and is non invasive. It's been
discussed for sever months and should have been added to my original
push, but I never pulled it into my queue.

* tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Do not create directories if lockdown is in affect
  tracing: Introduce trace event injection
  tracing: Fix __print_hex_dump scope

Delta		File
+331	-0	kernel/trace/trace_events_inject.c
+17	-0	kernel/trace/trace.c
+9	-0	kernel/trace/Kconfig
+6	-0	kernel/trace/ring_buffer.c
+6	-0	kernel/trace/trace_events.c
+1	-0	kernel/trace/Makefile
+1	-0	include/trace/trace_events.h
+1	-0	kernel/trace/trace.h
+372	-0	8 files

Unified Split Raw