From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Apr 2017 16:31:51 +0000 (-0700)
Subject: Merge tag 'trace-v4.11-rc5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0bad6d7e935a45d0dfbe6925f4ca36ad8812ff65;p=openwrt%2Fstaging%2Fblogic.git

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

0bad6d7e935a45d0dfbe6925f4ca36ad8812ff65