From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Sep 2017 16:38:07 +0000 (-1000)
Subject: Merge tag 'trace-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v4.14-rc2~34
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c52f56a69d104d5294af3d652776d94b1ef6a175;p=linux-2.6-block.git

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

c52f56a69d104d5294af3d652776d94b1ef6a175