Hi all,
On Wed, 30 Sep 2020 14:07:15 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/lib/bpf/btf.c
>
> between commit:
>
> 1245008122d7 ("libbpf: Fix native endian assumption when parsing BTF")
>
> from the bpf tree and commit:
Hi all,
On Fri, 26 Jun 2020 10:05:27 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/testing/selftests/bpf/progs/bpf_iter_netlink.c
>
> between commits:
>
> 9c82a63cf370 ("libbpf: Fix CO-RE relocs against .text section")
> 647
Hi all,
This is now a conflict between the net and net-next trees.
On Wed, 9 Oct 2019 09:47:25 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/lib/bpf/Makefile
>
> between commit:
>
> 1bd63524593b ("libbpf: handle symbol versio
Hi all,
This is now a conflict between the net and net-next trees.
On Tue, 8 Oct 2019 09:48:40 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/lib/bpf/Makefile
>
> between commit:
>
> 1bd63524593b ("libbpf: handle symbol versio
Hi Jakub,
On Mon, 14 May 2018 13:41:40 -0700 Jakub Kicinski
wrote:
>
> On Mon, 14 May 2018 11:57:00 +1000, Stephen Rothwell wrote:
> > diff --cc tools/lib/bpf/libbpf.c
> > index 8da4eeb101a6,df54c4c9e48a..
> > --- a/tools/lib/bpf/libbpf.c
> > +++ b/tools/lib/bpf/libbpf.c
> > @@@ -216
On Mon, 14 May 2018 11:57:00 +1000, Stephen Rothwell wrote:
> diff --cc tools/lib/bpf/libbpf.c
> index 8da4eeb101a6,df54c4c9e48a..
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@@ -2163,9 -2193,12 +2193,12 @@@ int bpf_prog_load_xattr(const struct bp
>
> if (!
> On May 1, 2018, at 10:50 PM, Stephen Rothwell wrote:
>
> Hi Song,
>
> On Wed, 2 May 2018 04:40:20 + Song Liu wrote:
>>
>>> - CHECK(build_id_matches < 1, "build id match",
>>> - "Didn't find expected build ID from the map\n");
>>> + if (CHECK(build_id_matches < 1, "build id
Hi Song,
On Wed, 2 May 2018 04:40:20 + Song Liu wrote:
>
> > - CHECK(build_id_matches < 1, "build id match",
> > - "Didn't find expected build ID from the map\n");
> > + if (CHECK(build_id_matches < 1, "build id match",
> > - "Didn't find expected build ID from the map
> On May 1, 2018, at 7:09 PM, Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_progs.c
>
> between commit:
>
> a4e21ff8d9a3 ("bpf: minor fix to selftest test_stacktrace_build_id()")
>
> from the
On 04/26/2018 02:53 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> samples/sockmap/Makefile
>
> between commit:
>
> 4dfe1bb95235 ("bpf: sockmap sample use clang flag, -target bpf")
>
> from the bpf tree and commit:
>
> 2e04
Hi Dave,
On Mon, 26 Feb 2018 11:41:47 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_verifier.c
>
> between commit:
>
> ca36960211eb ("bpf: allow xadd only on aligned memory")
>
> from the bpf tree a
On 02/26/2018 01:41 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_verifier.c
>
> between commit:
>
> ca36960211eb ("bpf: allow xadd only on aligned memory")
>
> from the bpf tree and commit:
>
12 matches
Mail list logo
