]> git.baikalelectronics.ru Git - kernel.git/commit
selftests/bpf: Fix merge conflict resolution
authorAlexei Starovoitov <ast@kernel.org>
Tue, 14 Jul 2020 03:55:48 +0000 (20:55 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Tue, 14 Jul 2020 03:59:25 +0000 (20:59 -0700)
commitf7d40ee7eff8fde2b0701b80c2aa3ba354f8f520
treea6a6f2e3e6710b5c863b463b070969b71ae7f34d
parent07dd1b7e68e4b83a1004b14dffd7e142c0bc79bd
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>
tools/testing/selftests/bpf/progs/bpf_iter_netlink.c