From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Oct 2020 16:41:02 +0000 (-0700)
Subject: Merge tag 'trace-v5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.15~2828
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa5ff93523ebc9f4cfd9fb37d021b5204ce14657;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-v5.9-rc6' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Two tracing fixes:

   - Fix temp buffer accounting that caused a WARNING for
     ftrace_dump_on_opps()

   - Move the recursion check in one of the function callback helpers to
     the beginning of the function, as if the rcu_is_watching() gets
     traced, it will cause a recursive loop that will crash the kernel"

* tag 'trace-v5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace: Move RCU is watching check after recursion check
  tracing: Fix trace_find_next_entry() accounting of temp buffer size
---

aa5ff93523ebc9f4cfd9fb37d021b5204ce14657