projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7391daf 854145e)
Merge tag 'trace-fixes-v4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2016 01:02:38 +0000 (18:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2016 01:02:38 +0000 (18:02 -0700)
commit83858a701cf3271f81dd321c2a81e5666c6ca8f4
treedfb6eeff810d88a47de5ee2c161036255cc70c58tree | snapshot (tar.gz zip)
parent7391daf2ffc780679d6ab3fad1db2619e5dd2c2acommit | diff
parent854145e0a8e9a05f7366d240e2f99d9c1ca6d6ddcommit | diff
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