From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Apr 2017 19:30:10 +0000 (-0700)
Subject: Merge tag 'trace-v4.11-rc5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: v4.14-rc1~1105
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=160062e19001b224370cddeaf652f258fd916fb0;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'trace-v4.11-rc5-5' of git://git./linux/kernel/git/rostedt/linux-trace

Pull two more ftrace fixes from Steven Rostedt:
 "While continuing my development, I uncovered two more small bugs.

  One is a race condition when enabling the snapshot function probe
  trigger. It enables the probe before allocating the snapshot, and if
  the probe triggers first, it stops tracing with a warning that the
  snapshot buffer was not allocated.

  The seconds is that the snapshot file should show how to use it when
  it is empty. But a bug fix from long ago broke the "is empty" test and
  the snapshot file no longer displays the help message"

* tag 'trace-v4.11-rc5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ring-buffer: Have ring_buffer_iter_empty() return true when empty
  tracing: Allocate the snapshot buffer before enabling probe
---

160062e19001b224370cddeaf652f258fd916fb0