Messages in this thread | | | Date | Thu, 19 Oct 2017 15:08:42 +0200 | From | Daniel Borkmann <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On 10/19/2017 03:05 PM, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/testing/selftests/bpf/test_verifier.c > > between commit: > > 28e33f9d78eef ("bpf: disallow arithmetic operations on context pointer") > > from the net tree and commit: > > 22c8852624fc9 ("bpf: improve selftests and add tests for meta pointer") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This
LGTM, thanks.
| |