From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Oct 2021 17:41:59 +0000 (-0700)
Subject: Merge tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.15~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fc596a56b334f4d593a2b49e5ff55af6aaa0816;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/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
---

1fc596a56b334f4d593a2b49e5ff55af6aaa0816