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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 3 Oct 2022 19:07:27 -0700 From: Jakub Kicinski <kuba@...nel.org> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: David Miller <davem@...emloft.net>, 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>, David Vernet <void@...ifault.com>, Kumar Kartikeya Dwivedi <memxor@...il.com>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Stanislav Fomichev <sdf@...gle.com> Subject: Re: linux-next: manual merge of the net-next tree with the bpf tree On Tue, 4 Oct 2022 12:24:28 +1100 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > kernel/bpf/helpers.c > > between commit: > > 8addbfc7b308 ("bpf: Gate dynptr API behind CAP_BPF") > > from the bpf tree and commits: > > 8a67f2de9b1d ("bpf: expose bpf_strtol and bpf_strtoul to all program types") > 5679ff2f138f ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF") > 205715673844 ("bpf: Add bpf_user_ringbuf_drain() helper") Thanks! Unrelated to the conflict but do you see this when building the latest by any chance? Is it just me and my poor old gcc 8.5? vmlinux.o: warning: objtool: ___ksymtab+bpf_dispatcher_xdp_func+0x0: data relocation to !ENDBR: bpf_dispatcher_xdp_func+0x0 vmlinux.o: warning: objtool: bpf_dispatcher_xdp+0xa0: data relocation to !ENDBR: bpf_dispatcher_xdp_func+0x0
Powered by blists - more mailing lists