Merge tag 'trace-v5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2021 22:37:13 +0000 (14:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2021 22:37:13 +0000 (14:37 -0800)
commita0d54b4f5b219fb31f0776e9f53aa137e78ae431
treea20bf9249156bf471a22639d9555b8d0f85524be
parent6e68b9961ff690ace07fac22c3c7752882ecc40a
parent7bb83f6fc4ee84e95d0ac0d14452c2619fb3fe70
Merge tag 'trace-v5.11-rc2' of git://git./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