Randy Dunlap (1):
      ftrace: Fix most kernel-doc warnings

Steven Rostedt (Google) (4):
      tracing: Remove __assign_str_len()
      tracing: Add __string_len() example
      tracing: Add warning if string in __assign_str() does not match __string()
      tracing: Remove second parameter to __assign_rel_str()

----
 fs/nfsd/trace.h                              |  8 +--
 include/trace/stages/stage6_event_callback.h | 31 ++++------
 kernel/trace/ftrace.c                        | 90 ++++++++++++++--------------
 samples/trace_events/trace-events-sample.h   | 18 +++---
 4 files changed, 74 insertions(+), 73 deletions(-)