Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 18 Nov 2021 21:13:16 +0000 (13:13 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 18 Nov 2021 21:13:16 +0000 (13:13 -0800)
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
20 files changed:
1  2 
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
include/linux/bpf.h
include/linux/skbuff.h
kernel/bpf/verifier.c
kernel/trace/bpf_trace.c
net/core/filter.c
net/core/sock.c
net/ipv4/tcp.c
net/ipv4/udp.c
net/smc/af_smc.c
tools/lib/bpf/bpf_gen_internal.h
tools/lib/bpf/gen_loader.c
tools/lib/bpf/libbpf.c
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/test_verifier.c

Simple merge
Simple merge
Simple merge
Simple merge
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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge