From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Apr 2023 18:02:03 +0000 (-0700)
Subject: Merge tag 'trace-v6.3-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace... 
X-Git-Tag: v6.6.7~3160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a8a804a4f5d6d0ec77831ca776b8db4a7a98306;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-v6.3-rc5-2' of git://git./linux/kernel/git/trace/linux-trace

Pull tracing fixes from Steven Rostedt:
 "A couple more minor fixes:

   - Reset direct->addr back to its original value on error in updating
     the direct trampoline code

   - Make lastcmd_mutex static"

* tag 'trace-v6.3-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing/synthetic: Make lastcmd_mutex static
  ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct()
---

1a8a804a4f5d6d0ec77831ca776b8db4a7a98306