From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH net-next] tools: bpf: fix BTF code added twice to
 different trees
Date: Thu, 02 Aug 2018 19:45:31 -0700 (PDT)
Message-ID: <20180802.194531.898874073231060427.davem@davemloft.net>
References: <20180803023027.32721-1-jakub.kicinski@netronome.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: alexei.starovoitov@gmail.com, daniel@iogearbox.net, kafai@fb.com,
        osk@fb.com, oss-drivers@netronome.com, netdev@vger.kernel.org
To: jakub.kicinski@netronome.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([23.128.96.9]:51598 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726373AbeHCEjf (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 3 Aug 2018 00:39:35 -0400
In-Reply-To: <20180803023027.32721-1-jakub.kicinski@netronome.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Jakub Kicinski <jakub.kicinski@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.kicinski@netronome.com>

Aha, you beat me to it.

Applied, thanks!