From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Oct 2018 16:47:28 +0000 (-0700)
Subject: Merge tag 'trace-v4.19-rc8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: v5.15~7683
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4267b3604a84ff72c013a0e3e467289908603a6;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-v4.19-rc8-3' of git://git./linux/kernel/git/rostedt/linux-trace

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
---

f4267b3604a84ff72c013a0e3e467289908603a6
diff --cc tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
index 8d647fb,c604438..4112821
--- a/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
@@@ -33,10 -43,12 +33,10 @@@ f
  
  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