diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-10-22 10:55:06 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-10-22 11:06:18 +0300 |
| commit | bd194611444caf7f30e9198b7e2b89522b257462 (patch) | |
| tree | 99129510f5d7b9cf6c384d4654b64d389cb24cc6 /tools/perf/scripts/python/task-analyzer.py | |
| parent | dbf53a29b28b277fa952a000245b558536c6bdd7 (diff) | |
| parent | 471f0aa7fa64e23766a1473b32d9ec3f0718895a (diff) | |
| download | linux-bd194611444caf7f30e9198b7e2b89522b257462.tar.xz | |
Merge branch 'x86/urgent' into x86/core, to resolve conflict
There's a conflict between the call-depth tracking commits in x86/core:
ee3e2469b346 ("x86/ftrace: Make it call depth tracking aware")
36b64f101219 ("x86/ftrace: Rebalance RSB")
eac828eaef29 ("x86/ftrace: Remove ftrace_epilogue()")
And these fixes in x86/urgent:
883bbbffa5a4 ("ftrace,kcfi: Separate ftrace_stub() and ftrace_stub_graph()")
b5f1fc318440 ("x86/ftrace: Remove ftrace_epilogue()")
It's non-trivial overlapping modifications - resolve them.
Conflicts:
arch/x86/kernel/ftrace_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/task-analyzer.py')
0 files changed, 0 insertions, 0 deletions