From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: pull-request: bpf-next 2018-01-19
Date: Sat, 20 Jan 2018 22:15:24 -0500 (EST)
Message-ID: <20180120.221524.2097596906975839856.davem@davemloft.net>
References: <20180120051229.239713-1-ast@kernel.org>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: daniel@iogearbox.net, netdev@vger.kernel.org
To: ast@kernel.org
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:37952 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1756745AbeAUDPd (ORCPT
        <rfc822;netdev@vger.kernel.org>); Sat, 20 Jan 2018 22:15:33 -0500
In-Reply-To: <20180120051229.239713-1-ast@kernel.org>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Alexei Starovoitov <ast@kernel.org>
Date: Fri, 19 Jan 2018 21:12:29 -0800

> The following pull-request contains BPF updates for your *net-next* tree.
> 
> The main changes are:
> 
> 1) bpf array map HW offload, from Jakub.
> 
> 2) support for bpf_get_next_key() for LPM map, from Yonghong.
> 
> 3) test_verifier now runs loaded programs, from Alexei.
> 
> 4) xdp cpumap monitoring, from Jesper.
> 
> 5) variety of tests, cleanups and small x64 JIT optimization, from Daniel.
> 
> 6) user space can now retrieve HW JITed program, from Jiong.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
> 
> Note there is a minor conflict between Russell's arm32 JIT fixes
> and removal of bpf_jit_enable variable by Daniel which should
> be resolved by keeping Russell's comment and removing that variable.

Pulled, thanks for the guidance on the merge conflict.

I hope I interpreted it correctly :-)