summaryrefslogtreecommitdiffstats
path: root/tools/testing/ktest
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@kernel.org>2020-07-13 20:55:48 -0700
committerAlexei Starovoitov <ast@kernel.org>2020-07-13 20:59:25 -0700
commitf7d40ee7eff8fde2b0701b80c2aa3ba354f8f520 (patch)
treea6a6f2e3e6710b5c863b463b070969b71ae7f34d /tools/testing/ktest
parent07dd1b7e68e4b83a1004b14dffd7e142c0bc79bd (diff)
downloadlinux-f7d40ee7eff8fde2b0701b80c2aa3ba354f8f520.tar.bz2
selftests/bpf: Fix merge conflict resolution
Remove double definition of structs. Fixes: 71930d61025e ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/ktest')
0 files changed, 0 insertions, 0 deletions