From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Apr 2021 01:40:00 +0000 (-0700)
Subject: Merge tag 'trace-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~7491
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50987beca096a7ed4f453a6da245fd6a2fadedeb;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'trace-v5.12-rc7' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Fix a memory link in dyn_event_release().

  An error path exited the function before freeing the allocated 'argv'
  variable"

* tag 'trace-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/dynevent: Fix a memory leak in an error handling path
---

50987beca096a7ed4f453a6da245fd6a2fadedeb