| commit | 89c0a361301f81d76be5ab77c3f5470b88792670 | [log] [tgz] |
|---|---|---|
| author | Alexei Starovoitov <ast@fb.com> | Thu Apr 06 12:20:26 2017 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 06 12:21:59 2017 -0700 |
| tree | 920d7bcc637b2edebd2188c23b216caed6a62f1f | |
| parent | 6f14f443d3e773439fb9cc6f2685ba90d5d026c5 [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>