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

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
  21234e3a84c7 ("net/mlx5e: Fix use after free in mlx5e_fs_init()")
  c7eafc5ed068 ("net/mlx5e: Convert ethtool_steering member of flow_steering struct to pointer")
https://lore.kernel.org/all/20220825104410.67d4709c@canb.auug.org.au/
https://lore.kernel.org/all/20220823055533.334471-1-saeed@kernel.org/

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

diff --cc Documentation/admin-guide/sysctl/net.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
index ef1dfbb78464a336b05a6cc87f722768b4c164af,e0ce5a233d0b4a46358e07527df4639e896c0bdb..1892ccb889b3fe87e6722619f7ddfe86a776ae90
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
@@@ -1454,17 -1394,12 +1454,17 @@@ struct mlx5e_flow_steering *mlx5e_fs_in
                        goto err_free_vlan;
        }
  
 -      return fs;
 +      err = mlx5e_fs_ethtool_alloc(fs);
 +      if (err)
 +              goto err_free_tc;
  
- err_free_fs:
-       kvfree(fs);
 +      return fs;
 +err_free_tc:
 +      mlx5e_fs_tc_free(fs);
  err_free_vlan:
        mlx5e_fs_vlan_free(fs);
+ err_free_fs:
+       kvfree(fs);
  err:
        return NULL;
  }

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/eswitch_offloads.c
Simple merge

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

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

diff --cc kernel/cgroup/cgroup.c
Simple merge

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

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

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

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

diff --cc net/dsa/slave.c
Simple merge

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