Linux kernel bug fix: selftests/bpf: Fix merge conflict resolution
Subsystem: tools (tools/testing/selftests/bpf/progs/bpf_iter_netlink.c)
Bug type: unknown, severity: unknown
Files changed: tools/testing/selftests/bpf/progs/bpf_iter_netlink.c
Introduced by David S. Miller on 2020-07-11 00:46:00 -0700; fixed by Alexei Starovoitov on 2020-07-13 20:59:25 -0700 (lifetime: 2 days)