Re: pull-request: bpf 2018-04-25

[Daniel Borkmann]

On 04/26/2018 05:05 AM, David Miller wrote:
> From: Daniel Borkmann 
> Date: Thu, 26 Apr 2018 00:04:50 +0200
> 
>> The following pull-request contains BPF updates for your *net* tree.
>  ...
>> Please consider pulling these changes from:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
> 
> Pulled, thanks Daniel.
> 
>> Would be great if you have a chance to merge net into net-next after
>> that since sockmap fixes are needed in bpf-next later on to avoid
>> ugly merge conflicts.
> 
> Done.

Awesome, thanks!

Re: pull-request: bpf 2018-04-25

[David Miller]

From: Daniel Borkmann 
Date: Thu, 26 Apr 2018 00:04:50 +0200

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

Pulled, thanks Daniel.

> Would be great if you have a chance to merge net into net-next after
> that since sockmap fixes are needed in bpf-next later on to avoid
> ugly merge conflicts.

Done.