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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Mon, 21 Mar 2022 11:23:28 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Andrii Nakryiko <andrii@...nel.org>, bpf <bpf@...r.kernel.org>,
        Networking <netdev@...r.kernel.org>,
        Russell King <linux@...linux.org.uk>
Cc:     Ard Biesheuvel <ardb@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        "Steven Rostedt (Google)" <rostedt@...dmis.org>
Subject: linux-next: manual merge of the bpf-next tree with the arm tree

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

Content of type "application/pgp-signature" skipped