From: Steven Rostedt (VMware) <rostedt@goodmis.org>
Date: Thu, 1 Apr 2021 18:16:37 +0000 (-0400)
Subject: Merge branch 'trace/ftrace/urgent' into HEAD
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=22d5755a852dca9895c263c24dae836dd14ae947;p=linux.git

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

22d5755a852dca9895c263c24dae836dd14ae947