[GIT PULL] s390 fixes for 6.14 merge window

[GIT PULL] s390 fixes for 6.14 merge window

[Alexander Gordeev]

Hi Linus,

please pull s390 fixes for the 6.14 merge window, which address
issues introduced with the merge of ftrace-v6.14 tag [1].

1. https://lore.kernel.org/all/173807816551.1854334.146350914633413330.stgit@devnote2/

Thanks,
Alexander

The following changes since commit 2e04247f7cce8b8cd8381a29078701691fec684d:

  Merge tag 'ftrace-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace (2025-01-21 15:15:28 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.14-3

for you to fetch changes up to b999589956dd3ae096b7d67b6fee4e9989a2e430:

  s390/tracing: Define ftrace_get_symaddr() for s390 (2025-01-29 15:12:40 +0100)

----------------------------------------------------------------
s390 fixes for 6.14 merge window

- Architecutre-specific ftrace recursion trylock tests were
  removed in favour of the generic function_graph_enter(),
  but s390 got missed. Remove this test for s390 as well.

- Add ftrace_get_symaddr() for s390, which returns the symbol
  address from ftrace 'ip' parameter

----------------------------------------------------------------
Masami Hiramatsu (Google) (2):
      s390/fgraph: Fix to remove ftrace_test_recursion_trylock()
      s390/tracing: Define ftrace_get_symaddr() for s390

 arch/s390/include/asm/ftrace.h | 1 +
 arch/s390/kernel/ftrace.c      | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

Re: [GIT PULL] s390 fixes for 6.14 merge window

[pr-tracker-bot]

The pull request you sent on Thu, 30 Jan 2025 16:58:11 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.14-3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b8a1c9f4b7106c94d95c83416d34277ee689638f

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html