From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: pull-request: bpf-next 2018-04-27
Date: Thu, 26 Apr 2018 21:20:48 -0400 (EDT)
Message-ID: <20180426.212048.449287312215018339.davem@davemloft.net>
References: <20180427011442.6525-1-daniel@iogearbox.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: ast@kernel.org, netdev@vger.kernel.org
To: daniel@iogearbox.net
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:45032 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1756544AbeD0BUw (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 26 Apr 2018 21:20:52 -0400
In-Reply-To: <20180427011442.6525-1-daniel@iogearbox.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Fri, 27 Apr 2018 03:14:42 +0200

> The following pull-request contains BPF updates for your *net-next* tree.
 ...
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

Pulled and build testing before pushing back out.

> There are two trivial merge conflicts while pulling:
> 
>   1) Remove samples/sockmap/Makefile since all sockmap tests have been
>      moved to selftests.
>   2) Add both hunks from tools/testing/selftests/bpf/.gitignore to the
>      file since git should ignore all of them.

Thanks for this.