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

Merge in fixes directly in prep for the 5.17 merge window.
No conflicts.

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

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

diff --cc drivers/net/can/rcar/rcar_canfd.c
Simple merge

diff --cc drivers/net/can/usb/gs_usb.c
Simple merge

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

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.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_main.c
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.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_offloads.c
Simple merge

diff --cc drivers/net/ppp/ppp_generic.c
Simple merge

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

diff --cc include/net/xfrm.h
Simple merge

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc net/mptcp/options.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/netfilter/nft_payload.c
Simple merge

diff --cc net/sched/act_ct.c
Simple merge

diff --cc net/sched/cls_api.c
Simple merge

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

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

diff --cc net/smc/smc_core.h
Simple merge

diff --cc net/xfrm/xfrm_output.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge