There's a conflict between the call-depth tracking commits in x86/core:

  ee3e2469 ("x86/ftrace: Make it call depth tracking aware")
  36b64f10 ("x86/ftrace: Rebalance RSB")
  eac828ea ("x86/ftrace: Remove ftrace_epilogue()")

And these fixes in x86/urgent:

  883bbbff ("ftrace,kcfi: Separate ftrace_stub() and ftrace_stub_graph()")
  b5f1fc31 ("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>