Linus,

Please pull the latest timers/urgent Git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2026-03-15

for you to fetch changes up to 755a648e78f12574482d4698d877375793867fa1:

Fix function tracer recursion bug by marking jiffies_64_to_clock_t()
notrace.

 Thanks,

	Ingo

------------------>
Steven Rostedt (1):
      time/jiffies: Mark jiffies_64_to_clock_t() notrace


 kernel/time/time.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 36fd2313ae7e..0d832317d576 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -697,7 +697,7 @@ EXPORT_SYMBOL(clock_t_to_jiffies);
  *
  * Return: jiffies_64 value converted to 64-bit "clock_t" (CLOCKS_PER_SEC)
  */
-u64 jiffies_64_to_clock_t(u64 x)
+notrace u64 jiffies_64_to_clock_t(u64 x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
 # if HZ < USER_HZ

The pull request you sent on Sun, 15 Mar 2026 04:30:56 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2026-03-15

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

Thank you!

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