]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'trace-v5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Mar 2022 19:47:59 +0000 (11:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Mar 2022 19:47:59 +0000 (11:47 -0800)
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


Trivial merge