linux-next: manual merge of the bpf-next tree with the arm tree

linux-next: manual merge of the bpf-next tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1278 bytes --]

Hi all,

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

  arch/arm/include/asm/stacktrace.h

between commit:

  538b9265c063 ("ARM: unwind: track location of LR value in stack frame")

from the arm tree and commit:

  515a49173b80 ("ARM: rethook: Add rethook arm implementation")

from the bpf-next 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/arm/include/asm/stacktrace.h
index 3e78f921b8b2,babed1707ca8..000000000000
--- a/arch/arm/include/asm/stacktrace.h
+++ b/arch/arm/include/asm/stacktrace.h
@@@ -14,10 -14,7 +14,10 @@@ struct stackframe 
  	unsigned long sp;
  	unsigned long lr;
  	unsigned long pc;
 +
 +	/* address of the LR value on the stack */
 +	unsigned long *lr_addr;
- #ifdef CONFIG_KRETPROBES
+ #if defined(CONFIG_KRETPROBES) || defined(CONFIG_RETHOOK)
  	struct llist_node *kr_cur;
  	struct task_struct *tsk;
  #endif

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]