From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Sep 2024 16:05:20 +0000 (-0700)
Subject: Merge tag 'trace-v6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace... 
X-Git-Tag: v6.12~529
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d8d276ba2fb5f9ac4984f5c10ae60858090babc;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'trace-v6.11-rc6' of git://git./linux/kernel/git/trace/linux-trace

Pull tracing fixes from Steven Rostedt:

 - Move declaration of interface_lock outside of CONFIG_TIMERLAT_TRACER

   The fix to some locking races moved the declaration of the
   interface_lock up in the file, but also moved it into the
   CONFIG_TIMERLAT_TRACER #ifdef block, breaking the build when that
   wasn't set. Move it further up and out of that #ifdef block.

 - Remove unused function run_tracer_selftest() stub

   When CONFIG_FTRACE_STARTUP_TEST is not set the stub function
   run_tracer_selftest() is not used and clang is warning about it.
   Remove the function stub as it is not needed.

* tag 'trace-v6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: Drop unused helper function to fix the build
  tracing/osnoise: Fix build when timerlat is not enabled
---

8d8d276ba2fb5f9ac4984f5c10ae60858090babc