]> 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)
commit89bb8d72d35d196a2abc1545a112763ec60499b8
tree23bc62d42783174ae3cfcf6e3e3b281895f7af3b
parentdbb86b92230c69c96086d4e717da1f4988e0c108
tools: bpf: fix BTF code added twice to different trees

commit a66f3fce8bc4 ("bpf: Introduce BPF_ANNOTATE_KV_PAIR")

added to the bpf and net trees what

commit 70cd16afc226 ("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