git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next

Head SHA1: 05a724bd44a68cd5c60bc4b949a946b57d4c9e55


Abel Vesa (1):
      ftrace: Join functions ftrace_module_init() and ftrace_init_module()

Chuyu Hu (1):
      tracing: Fix comment to use tracing_on over tracing_enable

Denis Kirjanov (1):
      tracing: Introduce TRACE_EVENT_FN_COND macro

Jerry Snitselaar (1):
      tracing: Use seq_buf_used() in seq_buf_to_user() instead of len

Julia Lawall (1):
      bpf: Constify bpf_verifier_ops structure

Li Bin (4):
      ftrace: Fix a typo in comment
      ia64: ftrace: Fix the comments for ftrace_modify_code()
      sh: ftrace: Fix the comments for ftrace_modify_code()
      metag: ftrace: Fix the comments for ftrace_modify_code

Steven Rostedt (Red Hat) (4):
      ftrace: Fix output of enabled_functions for showing tramp
      ftrace: Remove use of control list and ops
      ftrace: Have ftrace_ops_get_func() handle RCU and PER_CPU flags too
      ftrace: Clean up ftrace_module_init() code

----
 arch/ia64/kernel/ftrace.c       |  12 ++-
 arch/metag/kernel/ftrace.c      |  11 ++-
 arch/sh/kernel/ftrace.c         |  12 ++-
 include/linux/ftrace.h          |  35 ++++----
 include/linux/tracepoint.h      |   4 +
 include/trace/define_trace.h    |   6 ++
 include/trace/trace_events.h    |   6 ++
 kernel/trace/bpf_trace.c        |   2 +-
 kernel/trace/ftrace.c           | 179 +++++++++++++++-------------------------
 kernel/trace/trace.h            |   6 +-
 kernel/trace/trace_event_perf.c |   2 +-
 lib/seq_buf.c                   |   6 +-
 12 files changed, 122 insertions(+), 159 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to