From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: pull-request: bpf-next 2018-11-26
Date: Mon, 26 Nov 2018 13:11:21 -0800 (PST)
Message-ID: <20181126.131121.902156280041340396.davem@davemloft.net>
References: <20181126132528.4969-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 ([23.128.96.9]:43760 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727241AbeK0IGr (ORCPT
        <rfc822;netdev@vger.kernel.org>); Tue, 27 Nov 2018 03:06:47 -0500
In-Reply-To: <20181126132528.4969-1-daniel@iogearbox.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Mon, 26 Nov 2018 14:25:28 +0100

> 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
> 
> Note, there is a tiny merge conflict in BPF's kselftest Makefile.
> Resolution is to take both chunks, like:
> 
>   [...]
>   test_sk_lookup_kern.o test_xdp_vlan.o test_queue_map.o test_stack_map.o \
>   xdp_dummy.o test_map_in_map.o

Pulled, thanks!