Messages in this thread | | | Date | Tue, 04 Aug 2020 16:57:43 -0400 | From | Steven Rostedt <> | Subject | [for-linus][PATCH 00/17] tracing: Last minute fixes for this merge window |
| |
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next
Head SHA1: c58b46cba71750c6e969625abb1cf3ddabb15e06
Chengming Zhou (2): ftrace: Setup correct FTRACE_FL_REGS flags for module ftrace: Do not let direct or IPMODIFY ftrace_ops be added to module and set trampolines
Josef Bacik (1): ftrace: Fix ftrace_trace_task return value
Kevin Hao (2): tracing/hwlat: Drop the duplicate assignment in start_kthread() tracing/hwlat: Honor the tracing_cpumask
Masami Hiramatsu (4): kprobes: Remove show_registers() function prototype lib/bootconfig: Add override operator support tools/bootconfig: Add testcases for value override operator Documentation: bootconfig: Add bootconfig override operator
Muchun Song (1): kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler
Nick Desaulniers (2): tracepoint: Mark __tracepoint_string's __used tracepoint: Use __used attribute definitions from compiler_attributes.h
Peng Fan (1): tracing/uprobe: Remove dead code in trace_uprobe_register()
Vincent Whitchurch (1): tracing: Remove outdated comment in stack handling
Wei Yang (2): tracing: Simplify defining of the next event id tracing: Save one trace_event->type by using __TRACE_LAST_TYPE
Zhaoyang Huang (1): trace : Have tracing buffer info use kvzalloc instead of kzalloc
---- Documentation/admin-guide/bootconfig.rst | 11 ++++++++++ include/linux/kprobes.h | 1 - include/linux/tracepoint.h | 11 +++++----- kernel/kprobes.c | 7 ++++++ kernel/trace/ftrace.c | 22 +++++++++++++------ kernel/trace/trace.c | 10 ++------- kernel/trace/trace.h | 7 +++++- kernel/trace/trace_hwlat.c | 6 ++--- kernel/trace/trace_output.c | 14 ++++++------ kernel/trace/trace_uprobe.c | 1 - lib/bootconfig.c | 33 +++++++++++++++++++--------- tools/bootconfig/samples/bad-override.bconf | 3 +++ tools/bootconfig/samples/bad-override2.bconf | 3 +++ tools/bootconfig/samples/good-override.bconf | 6 +++++ tools/bootconfig/test-bootconfig.sh | 13 +++++++++++ 15 files changed, 104 insertions(+), 44 deletions(-) create mode 100644 tools/bootconfig/samples/bad-override.bconf create mode 100644 tools/bootconfig/samples/bad-override2.bconf create mode 100644 tools/bootconfig/samples/good-override.bconf
| |