From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Oct 2020 00:09:38 +0000 (-0700)
Subject: Merge tag 'trace-v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.10.7~1326
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5e5c274c920f693d9c1ab65440d8e53a4530aca;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull tracing ring-buffer fix from Steven Rostedt:
 "The success return value of ring_buffer_resize() is stated to be
  zero and checked that way.

  But it was incorrectly returning the size allocated.

  Also, a fix to a comment"

* tag 'trace-v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ring-buffer: Update the description for ring_buffer_wait
  ring-buffer: Return 0 on success from ring_buffer_resize()
---

a5e5c274c920f693d9c1ab65440d8e53a4530aca