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

Resolve structural conflict between:

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

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

  0298739b79: ("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: Ingo Molnar <mingo@kernel.org>

2020-05-18 13:09:37 +03:00

3.7 KiB

Raw Blame History

View Raw