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

Merge conflict of mlx5 resolved using instructions in merge
commit 9566e650bf7fdf58384bb06df634f7531ca3a97e.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.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_ethtool.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
index 5be3da62149948c069d9b057054ba96c338b17b2,00b2d4a86159f142e491278769fe1679ce5a2d20..c57f7533a6d0b74e2fede85392b2a5a1779b405e
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@@ -2057,15 -1839,18 +2061,20 @@@ static int parse_cls_flower(struct mlx5
        struct mlx5_core_dev *dev = priv->mdev;
        struct mlx5_eswitch *esw = dev->priv.eswitch;
        struct mlx5e_rep_priv *rpriv = priv->ppriv;
-       u8 match_level, tunnel_match_level = MLX5_MATCH_NONE;
        struct mlx5_eswitch_rep *rep;
 +      bool is_eswitch_flow;
        int err;
  
-       err = __parse_cls_flower(priv, spec, f, filter_dev, &match_level, &tunnel_match_level);
+       inner_match_level = MLX5_MATCH_NONE;
+       outer_match_level = MLX5_MATCH_NONE;
+ 
+       err = __parse_cls_flower(priv, spec, f, filter_dev, &inner_match_level,
+                                &outer_match_level);
+       non_tunnel_match_level = (inner_match_level == MLX5_MATCH_NONE) ?
+                                outer_match_level : inner_match_level;
  
 -      if (!err && (flow->flags & MLX5E_TC_FLOW_ESWITCH)) {
 +      is_eswitch_flow = mlx5e_is_eswitch_flow(flow);
 +      if (!err && is_eswitch_flow) {
                rep = rpriv->rep;
                if (rep->vport != MLX5_VPORT_UPLINK &&
                    (esw->offloads.inline_mode != MLX5_INLINE_MODE_NONE &&
@@@ -2079,11 -1864,11 +2088,11 @@@
                }
        }
  
 -      if (flow->flags & MLX5E_TC_FLOW_ESWITCH) {
 +      if (is_eswitch_flow) {
-               flow->esw_attr->match_level = match_level;
-               flow->esw_attr->tunnel_match_level = tunnel_match_level;
+               flow->esw_attr->inner_match_level = inner_match_level;
+               flow->esw_attr->outer_match_level = outer_match_level;
        } else {
-               flow->nic_attr->match_level = match_level;
+               flow->nic_attr->match_level = non_tunnel_match_level;
        }
  
        return err;

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

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

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
Simple merge

diff --cc drivers/net/ethernet/myricom/myri10ge/myri10ge.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

diff --cc drivers/net/netdevsim/dev.c
index c217049552f7be3e7cd46021a9d312a4e01a3e9d,bcc40a2366248be1954f4ba7d67184009b58e548..c5b026150bf5140593becd1fed315bd1c7cebd70
--- 1/drivers/net/netdevsim/dev.c
--- 2/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@@ -667,18 -280,10 +663,12 @@@ nsim_dev_create(struct nsim_bus_dev *ns
        INIT_LIST_HEAD(&nsim_dev->port_list);
        mutex_init(&nsim_dev->port_list_lock);
        nsim_dev->fw_update_status = true;
 +      nsim_dev->max_macs = NSIM_DEV_MAX_MACS_DEFAULT;
 +      nsim_dev->test1 = NSIM_DEV_TEST1_DEFAULT;
  
-       nsim_dev->fib_data = nsim_fib_create();
-       if (IS_ERR(nsim_dev->fib_data)) {
-               err = PTR_ERR(nsim_dev->fib_data);
-               goto err_devlink_free;
-       }
- 
        err = nsim_dev_resources_register(devlink);
        if (err)
-               goto err_fib_destroy;
+               goto err_devlink_free;
  
        err = devlink_register(devlink, &nsim_bus_dev->dev);
        if (err)
@@@ -735,13 -316,8 +723,12 @@@ static void nsim_dev_destroy(struct nsi
  
        nsim_bpf_dev_exit(nsim_dev);
        nsim_dev_debugfs_exit(nsim_dev);
 +      nsim_dev_traps_exit(devlink);
 +      nsim_dev_dummy_region_exit(nsim_dev);
 +      devlink_params_unregister(devlink, nsim_devlink_params,
 +                                ARRAY_SIZE(nsim_devlink_params));
        devlink_unregister(devlink);
        devlink_resources_unregister(devlink, NULL);
-       nsim_fib_destroy(nsim_dev->fib_data);
        mutex_destroy(&nsim_dev->port_list_lock);
        devlink_free(devlink);
  }

diff --cc drivers/net/netdevsim/netdevsim.h
Simple merge

diff --cc drivers/net/phy/at803x.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/usb/lan78xx.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
Simple merge

diff --cc drivers/s390/net/qeth_core_main.c
Simple merge

diff --cc drivers/staging/unisys/visornic/visornic_main.c
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

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

diff --cc include/net/netfilter/nf_tables.h
Simple merge

diff --cc include/net/netfilter/nf_tables_offload.h
Simple merge

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

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

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

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

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

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

diff --cc net/rxrpc/ar-internal.h
Simple merge

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

diff --cc net/tipc/link.c
Simple merge

diff --cc net/tipc/msg.h
Simple merge

diff --cc net/tls/tls_device.c
Simple merge

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

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