Minor changes, but this includes updates from Mathieu Desnoyers for
fixing the documentation of the way the current code works in my next
repo. He's currently working on other ways to handle the changes, but
until that is ready, this will have to do.

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

Head SHA1: cb1deb5fc1fded22401c0e9ca6bda056a7f1b553


Jiri Slaby (1)
      ftrace: Fix compilation warning about control_ops_free

Mathieu Desnoyers (2)
      tracepoints: API doc update to data argument
      tracepoints: API doc update to tracepoint_probe_register() return value

Sasha Levin (1)
      ftrace: Constify ftrace_text_reserved

----
 include/linux/ftrace.h |    4 ++--
 kernel/trace/ftrace.c  |   12 ++++++------
 kernel/tracepoint.c    |   16 +++++++++++++++-
 3 files changed, 23 insertions(+), 9 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