Merge tag 'trace-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Sep 2017 16:38:07 +0000 (06:38 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Sep 2017 16:38:07 +0000 (06:38 -1000)
commitc52f56a69d104d5294af3d652776d94b1ef6a175
tree5c4014d8b4b05668dbfb98b90fce0c41e839987f
parent820bf5c419e4b85298e5c3001bd1b5be46d60765
parent75df6e688ccd517e339a7c422ef7ad73045b18a2
Merge tag 'trace-v4.14-rc1' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "This includes three minor fixes.

    - Have writing to trace file clear the irqsoff (and friends) tracer

    - trace_pipe behavior for instance buffers was different than top
      buffer

    - Show a message of why mmiotrace doesn't start from commandline"

* tag 'trace-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix trace_pipe behavior for instance traces
  tracing: Ignore mmiotrace from kernel commandline
  tracing: Erase irqsoff trace with empty write