]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'a924c573fe1ba48a8e40a3c0bfaa0eb32f908661' 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)
commitb9ff075068066d22418ee7d522d69d17a1ea8f1b
tree5152c0fd981fbef6389cab76388c93b93f74f17d
parentd91c3e12a6d3b22ef8c72cbaa696ef33dd177344
parenta924c573fe1ba48a8e40a3c0bfaa0eb32f908661
Merge commit 'a924c573fe1ba48a8e40a3c0bfaa0eb32f908661' into trace/ftrace/core

Need to get the changes from a924c573fe1b ("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