[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20180507.233625.482183733920424509.davem@davemloft.net>
Date: Mon, 07 May 2018 23:36:25 -0400 (EDT)
From: David Miller <davem@...emloft.net>
To: daniel@...earbox.net
Cc: ast@...nel.org, netdev@...r.kernel.org
Subject: Re: pull-request: bpf-next 2018-05-05
From: Daniel Borkmann <daniel@...earbox.net>
Date: Sat, 5 May 2018 02:25:47 +0200
> The following pull-request contains BPF updates for your *net-next* tree.
>
> The main changes are:
...
> Please consider pulling these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
Pulled.
> This has a minor merge conflict in tools/testing/selftests/bpf/test_progs.c.
> Resolution is to take the hunk from bpf-next tree and change the first CHECK()
> condition such that the missing '\n' is added to the end of the string, like:
>
> if (CHECK(build_id_matches < 1, "build id match",
> "Didn't find expected build ID from the map\n"))
> goto disable_pmu;
Thanks a lot for this.
Powered by blists - more mailing lists