From: Alexander Gordeev <agordeev@linux.ibm.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Vasily Gorbik <gor@linux.ibm.com>,
Heiko Carstens <hca@linux.ibm.com>,
linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [GIT PULL] s390 fixes for 6.14 merge window
Date: Thu, 30 Jan 2025 16:58:11 +0100 [thread overview]
Message-ID: <Z5uhk4LusN5aGRwM@tuxmaker.boeblingen.de.ibm.com> (raw)
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(-)
next reply other threads:[~2025-01-30 15:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-30 15:58 Alexander Gordeev [this message]
2025-01-30 18:56 ` [GIT PULL] s390 fixes for 6.14 merge window pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z5uhk4LusN5aGRwM@tuxmaker.boeblingen.de.ibm.com \
--to=agordeev@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox