Commit 0e6bb5b7 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

kernel/bpf/verifier.c
  82995598 ("bpf: Fix verifier log for async callback return values")
  a923819f

 ("bpf: Treat first argument as return value for bpf_throw")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2f0968a0 e8c127b0
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment