Gautam Menghani (1):
      tracing/uprobes: Remove unwanted initialization in __trace_uprobe_create()

Masami Hiramatsu (Google) (1):
      tracing/kprobes: Check whether get_kretprobe() returns NULL in kretprobe_dispatcher()

Xiang wangx (1):
      tracefs: Fix syntax errors in comments

sunliming (1):
      tracing: Simplify conditional compilation code in tracing_set_tracer()

----
 fs/tracefs/inode.c          |  2 +-
 kernel/trace/trace.c        |  2 --
 kernel/trace/trace_kprobe.c | 11 ++++++++++-
 kernel/trace/trace_uprobe.c |  1 -
 4 files changed, 11 insertions(+), 5 deletions(-)