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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc include/linux/bpf.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

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

diff --cc kernel/trace/bpf_trace.c
Simple merge

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

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

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

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

diff --cc net/smc/af_smc.c
Simple merge

diff --cc tools/lib/bpf/bpf_gen_internal.h
Simple merge

diff --cc tools/lib/bpf/gen_loader.c
Simple merge

diff --cc tools/lib/bpf/libbpf.c
Simple merge

diff --cc tools/testing/selftests/bpf/Makefile
Simple merge

diff --cc tools/testing/selftests/bpf/test_verifier.c
Simple merge