Merge tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2021 17:41:59 +0000 (10:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2021 17:41:59 +0000 (10:41 -0700)
commit1fc596a56b334f4d593a2b49e5ff55af6aaa0816
treee46c54870976913df62563cd643860feb889df0e
parent646b0de5fe32306eaf5399647adf2177d4417021
parent4e84dc47bb48accbbeeba4e6bb3f31aa7895323c
Merge tag 'trace-v5.15-rc6' of git://git./linux/kernel/git/rostedt/linux-trace

Pull nds32 tracing fix from Steven Rostedt:
 "Fix nds32le build when DYNAMIC_FTRACE is disabled

  A randconfig found that nds32le architecture fails to build due to a
  prototype mismatch between a ftrace function pointer and the function
  it was to be assigned to. That function pointer prototype missed being
  updated when all the ftrace callbacks were updated"

* tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace/nds32: Update the proto for ftrace_trace_function to match ftrace_stub