From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Jan 2021 22:37:13 +0000 (-0800)
Subject: Merge tag 'trace-v5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.11-rc4~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0d54b4f5b219fb31f0776e9f53aa137e78ae431;p=thirdparty%2Fkernel%2Fstable.git

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
---

a0d54b4f5b219fb31f0776e9f53aa137e78ae431