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

Head SHA1: f6716bf04b50e791f47a5e35002ccec22b7c74be


Jiapeng Chong (1):
      fgraph: Remove some unused functions

Steven Rostedt (Google) (13):
      ftrace: Add back ftrace_update_trampoline() to ftrace_update_pid_func()
      ftrace/selftests: Fix pid test with function graph not showing pids
      ftrace: Rename dup_hash() and comment it
      ftrace: Remove "ftrace_hash" parameter from __ftrace_hash_rec_update()
      ftrace: Add comments to ftrace_hash_rec_disable/enable()
      ftrace: Convert "inc" parameter to bool in ftrace_hash_rec_update_modify()
      ftrace: Add comments to ftrace_hash_move() and friends
      ftrace: Declare function_trace_op in header to quiet sparse warning
      ftrace: Assign ftrace_list_end to ftrace_ops_list type cast to RCU
      ftrace: Assign RCU list variable with rcu_assign_ptr()
      ftrace: Fix prototypes for ftrace_startup/shutdown_subops()
      function_graph: Make fgraph_do_direct static key static
      function_graph: Do not update pid func if CONFIG_DYNAMIC_FTRACE not enabled

Tatsuya S (1):
      ftrace: Hide one more entry in stack trace when ftrace_pid is enabled

----
 include/linux/ftrace.h                             |   3 +
 kernel/trace/fgraph.c                              |  17 +--
 kernel/trace/ftrace.c                              | 166 ++++++++++++---------
 kernel/trace/ftrace_internal.h                     |   9 ++
 kernel/trace/trace.h                               |   1 -
 kernel/trace/trace_functions.c                     |   7 +-
 .../ftrace/test.d/ftrace/func-filter-pid.tc        |   2 +
 7 files changed, 120 insertions(+), 85 deletions(-)