From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Jul 2015 18:14:10 +0000 (-0700)
Subject: Merge tag 'trace-v4.2-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... 
X-Git-Tag: v4.2-rc3~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7558009751a591c3be148b2569b37efb951828d8;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge tag 'trace-v4.2-rc1-fix' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Fengguang Wu discovered a crash that happened to be because of the
  branch tracer (traces unlikely and likely branches) when enabled with
  certain debug options.

  What happened was that various debug options like lockdep and
  DEBUG_PREEMPT can cause parts of the branch tracer to recurse outside
  its recursion protection.  In fact, part of its recursion protection
  used these features that caused the lockup.  This cleans up the code a
  little and makes the recursion protection a bit more robust"

* tag 'trace-v4.2-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Have branch tracer use recursive field of task struct
---

7558009751a591c3be148b2569b37efb951828d8