From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Nov 2021 18:16:33 +0000 (-0800)
Subject: Merge tag 'trace-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v6.6.17~8843
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=600b18f88f2625ba48542dfeaa5fe8b23b3fd2c4;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'trace-v5.16-3' of git://git./linux/kernel/git/rostedt/linux-trace

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

   - Add mutex protection to ring_buffer_reset()

   - Fix deadlock in modify_ftrace_direct_multi()"

* tag 'trace-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace/direct: Fix lockup in modify_ftrace_direct_multi
  ring-buffer: Protect ring_buffer_reset() from reentrancy
---

600b18f88f2625ba48542dfeaa5fe8b23b3fd2c4