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

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
  commit 077cdda764c7 ("net/mlx5e: TC, Fix memory leak with rules with internal port")
  commit 31108d142f36 ("net/mlx5: Fix some error handling paths in 'mlx5e_tc_add_fdb_flow()'")
  commit 4390c6edc0fb ("net/mlx5: Fix some error handling paths in 'mlx5e_tc_add_fdb_flow()'")
  https://lore.kernel.org/all/20211229065352.30178-1-saeed@kernel.org/

net/smc/smc_wr.c
  commit 49dc9013e34b ("net/smc: Use the bitmap API when applicable")
  commit 349d43127dac ("net/smc: fix kernel panic caused by race of smc_sock")
  bitmap_zero()/memset() is removed by the fix

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/atheros/ag71xx.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_ptp.c
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.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_tc.c
Simple merge

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

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

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

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/bridge/br_sysfs_br.c
Simple merge

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

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

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

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

diff --cc net/sctp/socket.c
Simple merge

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

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

diff --cc tools/testing/selftests/net/mptcp/config
Simple merge