]> git.baikalelectronics.ru Git - kernel.git/commit
tools: bpf: fix BTF code added twice to different trees
authorJakub Kicinski <jakub.kicinski@netronome.com>
Fri, 3 Aug 2018 02:30:27 +0000 (19:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 3 Aug 2018 02:45:14 +0000 (19:45 -0700)
commit2308494ca972d7392d4165394db0cb16e78ad34c
tree23bc62d42783174ae3cfcf6e3e3b281895f7af3b
parent6e415dde91335054c6bcaecfc2961f7a74002f6c
tools: bpf: fix BTF code added twice to different trees

commit acfe2deee148 ("bpf: Introduce BPF_ANNOTATE_KV_PAIR")

added to the bpf and net trees what

commit 1d0cf6fbec8e ("bpf: btf: export btf types and name by offset from lib")

has already added to bpf-next/net-next, but in slightly different
location.  Remove the duplicates (to fix build of libbpf).

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
tools/lib/bpf/btf.c
tools/lib/bpf/btf.h