Merge tag 'trace-v4.17-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 May 2018 12:28:48 +0000 (07:28 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 May 2018 12:28:48 +0000 (07:28 -0500)
commit3d661e2a2d1cf0ad1ce54d690f05e755da59e6c9
treea87b5aa09ec63289fd14dcdbdc761e1f72a4f4a8
parent786b71f5b754273ccef6d9462e52062b3e1f9877
parent2824f5033248600673e3e126a4d135363cbfd9ac
Merge tag 'trace-v4.17-rc4-3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "While writing selftests for a new feature, I triggered two existing
  bugs that deal with triggers and instances.

   - a generic trigger bug where the triggers are not removed from a
     linked list properly when deleting an instance.

   - a bug specific to snapshots, where the snapshot is done in the top
     level buffer, when it is supposed to snapshot the buffer associated
     to the instance the snapshot trigger exists in"

* tag 'trace-v4.17-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Make the snapshot trigger work with instances
  tracing: Fix crash when freeing instances with event triggers