]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d8b4e90) | patch
selftests/bpf: fix merge conflict
authorAlexei Starovoitov <ast@fb.com>
Thu, 6 Apr 2017 19:20:26 +0000 (12:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Apr 2017 19:21:59 +0000 (12:21 -0700)
commit03c3122c3023d0c4ffbdf25d65f97f27bb946e35
tree920d7bcc637b2edebd2188c23b216caed6a62f1ftree | snapshot
parentd8b4e90695994c2a63d507bfbcfbb91be478a0c4commit | diff
selftests/bpf: fix merge conflict

fix artifact of merge resolution

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
tools/testing/selftests/bpf/test_verifier.c diff | blob | history
Linux Kernel Source Tree.