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>

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge