Merge branch 'trace/ftrace/urgent' into HEAD
authorSteven Rostedt (VMware) <rostedt@goodmis.org>
Thu, 1 Apr 2021 18:16:37 +0000 (14:16 -0400)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Thu, 1 Apr 2021 18:16:37 +0000 (14:16 -0400)
commit22d5755a852dca9895c263c24dae836dd14ae947
tree562d170a7b69fe463b067a6cffd3e92e6a76ab19
parent70193038a6ec9bbf10990a126432b0cbf56aa339
parent9deb193af69d3fd6dd8e47f292b67c805a787010
Merge branch 'trace/ftrace/urgent' into HEAD

Needed to merge trace/ftrace/urgent to get:

  Commit 59300b36f85 ("ftrace: Check if pages were allocated before calling free_pages()")

To clean up the code that is affected by it as well.
kernel/trace/ftrace.c
kernel/trace/trace.c