From: Alexei Starovoitov <a...@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 :-)

Reply via email to