diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-08 10:48:25 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-08 10:48:25 -0500 |
| commit | 62cd277039a3413604f486f0ca87faec810d7bb7 (patch) | |
| tree | 2bc63a72a3c46a91fc4dcf0ed2a7e60a69859c2a /MAINTAINERS | |
| parent | tuntap: fix possible deadlock when fail to register netdev (diff) | |
| parent | Merge branch 'bpf-devel-doc' (diff) | |
| download | linux-dev-62cd277039a3413604f486f0ca87faec810d7bb7.tar.xz linux-dev-62cd277039a3413604f486f0ca87faec810d7bb7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
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>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4007fa2e193e..77ad4bbeb669 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2724,12 +2724,16 @@ M: Alexei Starovoitov <ast@kernel.org> M: Daniel Borkmann <daniel@iogearbox.net> L: netdev@vger.kernel.org L: linux-kernel@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git S: Supported F: arch/x86/net/bpf_jit* F: Documentation/networking/filter.txt F: Documentation/bpf/ F: include/linux/bpf* F: include/linux/filter.h +F: include/trace/events/bpf.h +F: include/trace/events/xdp.h F: include/uapi/linux/bpf* F: include/uapi/linux/filter.h F: kernel/bpf/ |