diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-28 08:42:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-28 08:42:41 -0400 |
| commit | 5f0d736e7f7db586141f974821b6ca6c1d906d5b (patch) | |
| tree | 8f62c1a24fd499a55deb455c6dd42bb51cd53275 /MAINTAINERS | |
| parent | b1a79360ee862f8ada4798ad2346fa45bb41b527 (diff) | |
| parent | 9076c49bdca2aa68c805f2677b2bccc4bde2bac1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Daniel Borkmann says:
====================
pull-request: bpf-next 2019-04-28
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) Introduce BPF socket local storage map so that BPF programs can store
private data they associate with a socket (instead of e.g. separate hash
table), from Martin.
2) Add support for bpftool to dump BTF types. This is done through a new
`bpftool btf dump` sub-command, from Andrii.
3) Enable BPF-based flow dissector for skb-less eth_get_headlen() calls which
was currently not supported since skb was used to lookup netns, from Stanislav.
4) Add an opt-in interface for tracepoints to expose a writable context
for attached BPF programs, used here for NBD sockets, from Matt.
5) BPF xadd related arm64 JIT fixes and scalability improvements, from Daniel.
6) Change the skb->protocol for bpf_skb_adjust_room() helper in order to
support tunnels such as sit. Add selftests as well, from Willem.
7) Various smaller misc fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 306c289b30c7..0af66fa919a8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10742,6 +10742,7 @@ L: linux-block@vger.kernel.org L: nbd@other.debian.org F: Documentation/blockdev/nbd.txt F: drivers/block/nbd.c +F: include/trace/events/nbd.h F: include/uapi/linux/nbd.h NETWORK DROP MONITOR |