From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jan 2025 18:53:49 +0000 (-0800)
Subject: Merge tag 's390-6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v6.14-rc1~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8a1c9f4b7106c94d95c83416d34277ee689638f;p=thirdparty%2Flinux.git

Merge tag 's390-6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Alexander Gordeev:

 - 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

* tag 's390-6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/tracing: Define ftrace_get_symaddr() for s390
  s390/fgraph: Fix to remove ftrace_test_recursion_trylock()
---

b8a1c9f4b7106c94d95c83416d34277ee689638f