Merge commit '0f17976568b3f72e676450af0c0db6f8752253d6' into trace/ftrace/core
authorSteven Rostedt (VMware) <rostedt@goodmis.org>
Wed, 5 Jul 2017 13:51:24 +0000 (09:51 -0400)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Wed, 5 Jul 2017 13:51:24 +0000 (09:51 -0400)
commit4dce17b26b6ac3bf29aa0eae1d28e14debe37747
tree5152c0fd981fbef6389cab76388c93b93f74f17d
parent4ec78467858739c0119569c0610676aa50dfa8fb
parent0f17976568b3f72e676450af0c0db6f8752253d6
Merge commit '0f17976568b3f72e676450af0c0db6f8752253d6' into trace/ftrace/core

Need to get the changes from 0f17976568b3 ("ftrace: Fix regression with
module command in stack_trace_filter") as it is required to fix some other
changes with stack_trace_filter and the new development code.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
kernel/trace/ftrace.c
kernel/trace/trace.c