From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Feb 2022 18:22:48 +0000 (-0800)
Subject: Merge tag 'trace-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: baikal/aarch64/sdk6.1~4686
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=31f3359df4630b2167c5c18272b86e703010fa11;p=kernel.git

Merge tag 'trace-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:

 - Fixes to the RTLA tooling

 - A fix to a tp_printk overriding tp_printk_stop_on_boot on the
   command line

* tag 'trace-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix tp_printk option related with tp_printk_stop_on_boot
  MAINTAINERS: Add RTLA entry
  rtla: Fix segmentation fault when failing to enable -t
  rtla/trace: Error message fixup
  rtla/utils: Fix session duration parsing
  rtla: Follow kernel version
---

31f3359df4630b2167c5c18272b86e703010fa11