]> 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)
commit88e2fa87fb71cb0ba73cfc0411a56191c462d834
treea6a6f2e3e6710b5c863b463b070969b71ae7f34d
parent7fcae0da1323f89b312e73d4aa8c9410d2d84840
selftests/bpf: Fix merge conflict resolution

Remove double definition of structs.

Fixes: 3e7032e415a2 ("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