diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-04-01 14:16:37 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-04-01 14:16:37 -0400 |
| commit | 22d5755a852dca9895c263c24dae836dd14ae947 (patch) | |
| tree | 562d170a7b69fe463b067a6cffd3e92e6a76ab19 /include/linux | |
| parent | 70193038a6ec9bbf10990a126432b0cbf56aa339 (diff) | |
| parent | 9deb193af69d3fd6dd8e47f292b67c805a787010 (diff) | |
| download | cachepc-linux-22d5755a852dca9895c263c24dae836dd14ae947.tar.gz cachepc-linux-22d5755a852dca9895c263c24dae836dd14ae947.zip | |
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.
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions