From: Jakub Kicinski <jakub.kicin...@netronome.com>
Date: Thu, 2 Aug 2018 19:30:27 -0700
> 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.kicin...@netronome.com>
Aha, you beat me to it.
Applied, thanks!
