From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 May 2016 01:02:38 +0000 (-0700)
Subject: Merge tag 'trace-fixes-v4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~13738
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83858a701cf3271f81dd321c2a81e5666c6ca8f4;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-fixes-v4.6-rc6' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Chunyu Hu noticed that if one writes into the trigger files within the
  ftrace subsystem of events that it can cause an oops.  This file is
  only writable by root, but still is a bug that needs to be fixed"

* tag 'trace-fixes-v4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Don't display trigger file for events that can't be enabled
---

83858a701cf3271f81dd321c2a81e5666c6ca8f4