diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-07-15 22:40:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-15 22:40:10 -0700 |
| commit | 82a1ffe57ec6455658584459de56ee4b401c1dfb (patch) | |
| tree | 66fd801e94825018e15701e508848b6a188bf2c6 /MAINTAINERS | |
| parent | ipv6: remove unnecessary local variable (diff) | |
| parent | Merge branch 'sockmap: add sockmap support for unix datagram socket' (diff) | |
| download | linux-dev-82a1ffe57ec6455658584459de56ee4b401c1dfb.tar.xz linux-dev-82a1ffe57ec6455658584459de56ee4b401c1dfb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2021-07-15
The following pull-request contains BPF updates for your *net-next* tree.
We've added 45 non-merge commits during the last 15 day(s) which contain
a total of 52 files changed, 3122 insertions(+), 384 deletions(-).
The main changes are:
1) Introduce bpf timers, from Alexei.
2) Add sockmap support for unix datagram socket, from Cong.
3) Fix potential memleak and UAF in the verifier, from He.
4) Add bpf_get_func_ip helper, from Jiri.
5) Improvements to generic XDP mode, from Kumar.
6) Support for passing xdp_md to XDP programs in bpf_prog_run, from Zvi.
===================
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 5779f6cacff7..e09c3944240c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10387,6 +10387,7 @@ F: net/core/skmsg.c F: net/core/sock_map.c F: net/ipv4/tcp_bpf.c F: net/ipv4/udp_bpf.c +F: net/unix/unix_bpf.c LANDLOCK SECURITY MODULE M: Mickaël Salaün <mic@digikod.net> |