On 04/03/2017 04:07 AM, Stephen Rothwell wrote:
Hi all,Today's linux-next merge of the net-next tree got conflicts in: tools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/test_verifier.c between commit: 02ea80b1850e ("bpf: add various verifier test cases for self-tests") from the net tree and commits: 6882804c916b ("selftests/bpf: add a test for overlapping packet range checks") fb30d4b71214 ("bpf: Add tests for map-in-map") from the net-next tree. I fixed it up (see below - though there are probably more fixups needed) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
Looks fine, thanks Stephen!
