Merge tag 'trace-v4.19-rc8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...

Pull tracing fixes from Steven Rostedt:
 "Masami had a couple more fixes to the synthetic events. One was a
  proper error return value, and the other is for the self tests"

* tag 'trace-v4.19-rc8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  selftests/ftrace: Fix synthetic event test to delete event correctly
  tracing: Return -ENOENT if there is no target synthetic event

diff --combined tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
index 8d647fb572dd396564ede17eaffa2947f6009f60,c604438df13b3a4a543d04823394f127c61a5092..41128219231a7cd19f8820330af8ebbe428ebd37
--- 1/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
--- 2/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
@@@ -1,7 -1,13 +1,7 @@@
  #!/bin/sh
  # description: event trigger - test synthetic event create remove
 -do_reset() {
 -    reset_trigger
 -    echo > set_event
 -    clear_trace
 -}
  
  fail() { #msg
 -    do_reset
      echo $1
      exit_fail
  }
@@@ -16,6 -22,10 +16,6 @@@ if [ ! -f synthetic_events ]; the
      exit_unsupported
  fi
  
 -clear_synthetic_events
 -reset_tracer
 -do_reset
 -
  echo "Test create synthetic event"
  
  echo 'wakeup_latency  u64 lat pid_t pid char comm[16]' > synthetic_events
@@@ -25,18 -35,20 +25,18 @@@ f
  
  reset_trigger
  
- echo "Test create synthetic event with an error"
- echo 'wakeup_latency  u64 lat pid_t pid char' > synthetic_events > /dev/null
+ echo "Test remove synthetic event"
+ echo '!wakeup_latency  u64 lat pid_t pid char comm[16]' >> synthetic_events
  if [ -d events/synthetic/wakeup_latency ]; then
-     fail "Created wakeup_latency synthetic event with an invalid format"
+     fail "Failed to delete wakeup_latency synthetic event"
  fi
  
  reset_trigger
  
- echo "Test remove synthetic event"
- echo '!wakeup_latency  u64 lat pid_t pid char comm[16]' > synthetic_events
+ echo "Test create synthetic event with an error"
+ echo 'wakeup_latency  u64 lat pid_t pid char' > synthetic_events > /dev/null
  if [ -d events/synthetic/wakeup_latency ]; then
-     fail "Failed to delete wakeup_latency synthetic event"
+     fail "Created wakeup_latency synthetic event with an invalid format"
  fi
  
 -do_reset
 -
  exit 0