Commit a0d54b4f5b21 for kernel

commit a0d54b4f5b219fb31f0776e9f53aa137e78ae431
Merge: 6e68b9961ff6 7bb83f6fc4ee
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jan 11 14:37:13 2021 -0800

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

    Pull tracing fix from Steven Rostedt:
     "Blacklist properly on all archs.

      The code to blacklist notrace functions for kprobes was not using the
      right kconfig option, which caused some archs (powerpc) to possibly
      not blacklist them"

    * tag 'trace-v5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      tracing/kprobes: Do the notrace functions check without kprobes on ftrace