From: Jakub Kicinski <kuba@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
David Vernet <void@manifault.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stanislav Fomichev <sdf@google.com>
Subject: Re: linux-next: manual merge of the net-next tree with the bpf tree
Date: Mon, 3 Oct 2022 19:07:27 -0700 [thread overview]
Message-ID: <20221003190727.0921e479@kernel.org> (raw)
In-Reply-To: <20221004122428.653bd5cd@canb.auug.org.au>
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
next prev parent reply other threads:[~2022-10-04 2:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 1:24 linux-next: manual merge of the net-next tree with the bpf tree Stephen Rothwell
2022-10-04 2:07 ` Jakub Kicinski [this message]
2022-10-04 22:45 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-09-23 0:45 Stephen Rothwell
2021-10-27 0:12 Stephen Rothwell
2021-06-22 1:06 Stephen Rothwell
2021-04-08 3:11 Stephen Rothwell
2021-04-08 3:02 Stephen Rothwell
2021-03-29 1:29 Stephen Rothwell
2021-03-29 8:28 ` Jiri Olsa
2020-07-16 1:59 Stephen Rothwell
2020-05-26 3:12 Stephen Rothwell
2020-05-26 5:45 ` Björn Töpel
2019-06-06 1:34 Stephen Rothwell
2019-02-20 0:37 Stephen Rothwell
2019-02-20 0:41 ` Alexei Starovoitov
2019-02-20 0:45 ` Stanislav Fomichev
2019-02-20 1:03 ` Stephen Rothwell
2019-02-20 0:48 ` Daniel Borkmann
2019-02-20 3:03 ` Stanislav Fomichev
2018-12-14 0:56 Stephen Rothwell
2018-12-03 2:16 Stephen Rothwell
2018-12-03 2:03 Stephen Rothwell
2018-08-01 1:35 Stephen Rothwell
2018-08-01 4:23 ` Yonghong Song
2018-07-26 1:19 Stephen Rothwell
2018-07-26 15:32 ` Martin KaFai Lau
2018-01-09 0:21 Stephen Rothwell
2018-01-09 0:29 ` Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221003190727.0921e479@kernel.org \
--to=kuba@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=memxor@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=sfr@canb.auug.org.au \
--cc=void@manifault.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).