From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Borkmann <daniel@iogearbox.net>
Subject: Re: pull-request: bpf-next 2018-09-25
Date: Wed, 26 Sep 2018 12:03:14 +0200
Message-ID: <53851db5-de9f-52db-20c4-9d98285568f6@iogearbox.net>
References: <20180925204343.30270-1-daniel@iogearbox.net>
 <20180925.204049.402375716601309433.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Cc: ast@kernel.org, netdev@vger.kernel.org
To: David Miller <davem@davemloft.net>
Return-path: <netdev-owner@vger.kernel.org>
Received: from www62.your-server.de ([213.133.104.62]:57170 "EHLO
        www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726404AbeIZQP3 (ORCPT
        <rfc822;netdev@vger.kernel.org>); Wed, 26 Sep 2018 12:15:29 -0400
In-Reply-To: <20180925.204049.402375716601309433.davem@davemloft.net>
Content-Language: en-US
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On 09/26/2018 05:40 AM, David Miller wrote:
> From: Daniel Borkmann <daniel@iogearbox.net>
> Date: Tue, 25 Sep 2018 22:43:43 +0200
> 
>> The following pull-request contains BPF updates for your *net-next*
>> tree.
> 
> Pulled, there was a minor merge conflict.  Please double check my work.

The resolution in tools/lib/bpf/Build looks good to me, thanks!