Merge tag 'trace-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Nov 2021 18:16:33 +0000 (10:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Nov 2021 18:16:33 +0000 (10:16 -0800)
commit600b18f88f2625ba48542dfeaa5fe8b23b3fd2c4
tree585207bd9519f564384f3b3fa9a9c0fb2fa3f0fc
parentf54ca91fe6f25c2028f953ce82f19ca2ea0f07bb
parent2e6e9058d13a22a6fdd36a8c444ac71d9656003a
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
kernel/trace/ftrace.c