linux-next: manual merge of the efi tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/arm64/kernel/stacktrace.c

between commit:

  0fbcd8abf337 ("arm64: Prohibit instrumentation on arch_stack_walk()")

from Linus' tree and commit:

  c2530a04a73e ("arm64: efi: Account for the EFI runtime stack in stack unwinder")

from the efi tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/kernel/stacktrace.c
index 117e2c180f3c,ee9fd2018cd7..000000000000
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@@ -186,7 -188,14 +188,14 @@@ void show_stack(struct task_struct *tsk
  			: stackinfo_get_unknown();		\
  	})
  
+ #define STACKINFO_EFI						\
+ 	({							\
+ 		((task == current) && current_in_efi())		\
+ 			? stackinfo_get_efi()			\
+ 			: stackinfo_get_unknown();		\
+ 	})
+ 
 -noinline notrace void arch_stack_walk(stack_trace_consume_fn consume_entry,
 +noinline noinstr void arch_stack_walk(stack_trace_consume_fn consume_entry,
  			      void *cookie, struct task_struct *task,
  			      struct pt_regs *regs)
  {

Attachment: pgpo9SNwElsSq.pgp
Description: OpenPGP digital signature