OSDN Git Service

Merge tag 'v5.7-rc6' into objtool/core, to pick up fixes and resolve semantic conflict
authorIngo Molnar <mingo@kernel.org>
Mon, 18 May 2020 10:00:36 +0000 (13:00 +0300)
committerIngo Molnar <mingo@kernel.org>
Mon, 18 May 2020 10:09:37 +0000 (13:09 +0300)
commit7c0577f4e609f7278ebd6d21e2de82b42f110944
tree4136e3c6beb37726f16cf1f6270f3f16cde7897e
parent6b5dd716da8fc3aba65e6b7d992dea0cee2f9528
parentb9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce
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>
arch/x86/entry/entry_64.S
arch/x86/kernel/ftrace.c
tools/objtool/check.c
tools/objtool/elf.h