projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7019303 9deb193)
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)
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.

1  2 
kernel/trace/ftrace.c patch | diff1 | diff2 | blob | history
kernel/trace/trace.c patch | diff1 | diff2 | blob | history

diff --cc kernel/trace/ftrace.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
Domain: System / Kernel;