From: Linus Torvalds Date: Fri, 9 Feb 2018 22:47:09 +0000 (-0800) Subject: Merge tag 'trace-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... X-Git-Tag: v4.16-rc1~17 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8158c2ffa4f48d1e4ed3d0e198651f007b598137;p=linux-2.6-block.git Merge tag 'trace-v4.16-rc1' of git://git./linux/kernel/git/rostedt/linux-trace Pull tracing fixes from Steven Rostedt: "Al Viro discovered some breakage with the parsing of the set_ftrace_filter as well as the removing of function probes. This fixes the code with Al's suggestions. I also added a few selftests to test the broken cases such that they wont happen again" * tag 'trace-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: selftests/ftrace: Add more tests for removing of function probes selftests/ftrace: Add some missing glob checks selftests/ftrace: Have reset_ftrace_filter handle multiple instances selftests/ftrace: Have reset_ftrace_filter handle modules tracing: Fix parsing of globs with a wildcard at the beginning ftrace: Remove incorrect setting of glob search field --- 8158c2ffa4f48d1e4ed3d0e198651f007b598137