Subject: linux-next: manual merge of the ftrace tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 28 Jul 2025 09:59:37 +1000

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  include/linux/entry-common.h

between commit:

  a70e9f647f50 ("entry: Split generic entry into generic exception and syscall entry")

from the tip tree and commit:

  bfab6646e9d9 ("unwind_user/deferred: Add unwind cache")

from the ftrace tree.

I fixed it up (I used the former version of this file and applied the
following merge fix patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

From: Stephen Rothwell <[email-masked]>
Date: Mon, 28 Jul 2025 09:53:01 +1000
Subject: [PATCH] fix up for "unwind_user/deferred: Add unwind cache"

interacting with "entry: Split generic entry into generic exception and
syscall entry" from the tip tree.

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 include/linux/irq-entry-common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/irq-entry-common.h b/include/linux/irq-entry-common.h
index 8af374331900..0cd828b4a444 100644
--- a/include/linux/irq-entry-common.h
+++ b/include/linux/irq-entry-common.h
@@ -7,6 +7,7 @@
 #include <linux/context_tracking.h>
 #include <linux/tick.h>
 #include <linux/kmsan.h>
+#include <linux/unwind_deferred.h>
 
 #include <asm/entry-common.h>
 
@@ -240,6 +241,7 @@ static __always_inline void exit_to_user_mode(void)
 	lockdep_hardirqs_on_prepare();
 	instrumentation_end();
 
+	unwind_reset_info();
 	user_enter_irqoff();
 	arch_exit_to_user_mode();
 	lockdep_hardirqs_on(CALLER_ADDR0);
-- 
2.50.1

-- 
Cheers,
Stephen Rothwell