| commit | 7c0577f4e609f7278ebd6d21e2de82b42f110944 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon May 18 13:00:36 2020 +0300 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon May 18 13:09:37 2020 +0300 |
| tree | 4136e3c6beb37726f16cf1f6270f3f16cde7897e | |
| parent | 6b5dd716da8fc3aba65e6b7d992dea0cee2f9528 [diff] | |
| parent | b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce [diff] |
Merge tag 'v5.7-rc6' into objtool/core, to pick up fixes and resolve semantic conflict
Resolve structural conflict between:
59566b0b622e: ("x86/ftrace: Have ftrace trampolines turn read-only at the end of system boot up")
which introduced a new reference to 'ftrace_epilogue', and:
0298739b7983: ("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>