]> asedeno.scripts.mit.edu Git - linux.git/commit
projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6b431d5) | patch
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)
commit6534770d6f176093b50896961107b2d545ef38f0
tree23bc62d42783174ae3cfcf6e3e3b281895f7af3btree | snapshot
parent6b431d50d2a8acd1c418b998b856a055252ebc3acommit | diff
tools: bpf: fix BTF code added twice to different trees

commit 38d5d3b3d5db ("bpf: Introduce BPF_ANNOTATE_KV_PAIR")

added to the bpf and net trees what

commit 92b57121ca79 ("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 diff | blob | history
tools/lib/bpf/btf.h diff | blob | history
local clone of linux.git