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
  829955981c55 ("bpf: Fix verifier log for async callback return values")
  a923819fb2c5 ("bpf: Treat first argument as return value for bpf_throw")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/can/Kconfig
Simple merge

diff --cc drivers/net/can/sja1000/sja1000.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_lag.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
Simple merge

diff --cc drivers/net/ethernet/renesas/ravb_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/rswitch.c
Simple merge

diff --cc drivers/net/macsec.c
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge