Skip to content
Commit 7c0577f4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v5.7-rc6' into objtool/core, to pick up fixes and resolve semantic conflict



Resolve structural conflict between:

  59566b0b: ("x86/ftrace: Have ftrace trampolines turn read-only at the end of system boot up")

which introduced a new reference to 'ftrace_epilogue', and:

  0298739b: ("x86,ftrace: Fix ftrace_regs_caller() unwind")

Which renamed it to 'ftrace_caller_end'. Rename the new usage site in the merge commit.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6b5dd716 b9bbe6ed
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment