From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Mar 2022 19:47:59 +0000 (-0800)
Subject: Merge tag 'trace-v5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v6.1-rc5~1895
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f40a33f5ea54c01d640b150eb63e94defeb9b614;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-v5.17-rc5' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:

 - Fix sorting on old "cpu" value in histograms

 - Fix return value of __setup() boot parameter handlers

* tag 'trace-v5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix return value of __setup handlers
  tracing/histogram: Fix sorting on old "cpu" value
---

f40a33f5ea54c01d640b150eb63e94defeb9b614