Merge tag 'trace-tools-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...

Pull tracing tools updates from Steven Rostedt

 - This is mostly just consolidating code between osnoise/timerlat and
   top/hist for easier maintenance and less future divergence

* tag 'trace-tools-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tools/rtla: Add remaining support for osnoise actions
  tools/rtla: Add test engine support for unexpected output
  tools/rtla: Fix -A option name in test comment
  tools/rtla: Consolidate code between osnoise/timerlat and hist/top
  tools/rtla: Create common_apply_config()
  tools/rtla: Move top/hist params into common struct
  tools/rtla: Consolidate common parameters into shared structure

diff --cc tools/tracing/rtla/src/actions.c
index 13ff1934d47c94f414c636afaf687f75a36618d3,991139f9069f149518ed15e105a865687d8dd735..8945aee58d511f13c6b07290069ca4db0cf0bd31
--- 1/tools/tracing/rtla/src/actions.c
--- 2/tools/tracing/rtla/src/actions.c
+++ b/tools/tracing/rtla/src/actions.c
@@@ -127,11 -127,11 +127,11 @@@ actions_add_continue(struct actions *se
   * actions_parse - add an action based on text specification
   */
  int
- actions_parse(struct actions *self, const char *trigger)
+ actions_parse(struct actions *self, const char *trigger, const char *tracefn)
  {
        enum action_type type = ACTION_NONE;
-       char *token;
+       const char *token;
 -      char trigger_c[strlen(trigger)];
 +      char trigger_c[strlen(trigger) + 1];
  
        /* For ACTION_SIGNAL */
        int signal = 0, pid = 0;