Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Dec 2017 15:48:25 +0000 (10:48 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Dec 2017 15:48:25 +0000 (10:48 -0500)
Alexei Starovoitov says:

====================
pull-request: bpf-next 2017-12-07

The following pull-request contains BPF updates for your net-next tree.

The main changes are:

1) Detailed documentation of BPF development process from Daniel.

2) Addition of is_fullsock, snd_cwnd and srtt_us fields to bpf_sock_ops
   from Lawrence.

3) Minor follow up for bpf_skb_set_tunnel_key() from William.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
MAINTAINERS
include/net/tcp.h

diff --cc MAINTAINERS
Simple merge
Simple merge