From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jul 2015 18:42:54 +0000 (-0700)
Subject: Merge tag 'trace-v4.2-rc2-fix3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.2~140
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=763e326c8bcded22460fb25def2ed0e2459dcc8d;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'trace-v4.2-rc2-fix3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull ftrace fix from Steven Rostedt:
 "Back in 3.16 the ftrace code was redesigned and cleaned up to remove
  the double iteration list (one for registered ftrace ops, and one for
  registered "global" ops), to just use one list.  That simplified the
  code but also broke the function tracing filtering on pid.

  This updates the code to handle the filtering again with the new
  logic"

* tag 'trace-v4.2-rc2-fix3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace: Fix breakage of set_ftrace_pid
---

763e326c8bcded22460fb25def2ed0e2459dcc8d