diff options
author | Jakub Kicinski <kuba@kernel.org> | 2020-10-15 21:45:00 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-15 21:45:00 +0200 |
commit | 105faa8742437c28815b2a3eb8314ebc5fd9288c (patch) | |
tree | 01fbc0680029418535d708935c7335b4c511523a /drivers/block/nbd.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
parent | net, sockmap: Don't call bpf_prog_put() on NULL pointer (diff) | |
download | linux-105faa8742437c28815b2a3eb8314ebc5fd9288c.tar.xz linux-105faa8742437c28815b2a3eb8314ebc5fd9288c.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Daniel Borkmann says:
====================
pull-request: bpf-next 2020-10-15
The main changes are:
1) Fix register equivalence tracking in verifier, from Alexei Starovoitov.
2) Fix sockmap error path to not call bpf_prog_put() with NULL, from Alex Dewar.
3) Fix sockmap to add locking annotations to iterator, from Lorenz Bauer.
4) Fix tcp_hdr_options test to use loopback address, from Martin KaFai Lau.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/block/nbd.c')
0 files changed, 0 insertions, 0 deletions