Merge tag 'trace-v4.11-rc5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Apr 2017 16:31:51 +0000 (09:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Apr 2017 16:31:51 +0000 (09:31 -0700)
commit0bad6d7e935a45d0dfbe6925f4ca36ad8812ff65
treef02a07f557756372a5f62ac23f582e6e931ad3fe
parent5ee4c5a92993458c6beaba76c087227675fc3ccd
parentd879d0b8c183aabeb9a65eba91f3f9e3c7e7b905
Merge tag 'trace-v4.11-rc5-3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull ftrace fix from Steven Rostedt:
 "Namhyung Kim discovered a use after free bug. It has to do with adding
  a pid filter to function tracing in an instance, and then freeing the
  instance"

* tag 'trace-v4.11-rc5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace: Fix function pid filter on instances