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

Conflicts:

net/ax25/af_ax25.c
  d7c4c9e075f8c ("ax25: fix incorrect dev_tracker usage")
  d62607c3fe459 ("net: rename reference+tracking helpers")

drivers/net/netdevsim/fib.c
  180a6a3ee60a ("netdevsim: fib: Fix reference count leak on route deletion failure")
  012ec02ae441 ("netdevsim: convert driver to use unlocked devlink API during init/fini")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

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

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_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/tc/post_act.c
Simple merge

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

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

diff --cc drivers/net/netdevsim/fib.c
index 94e7512,38a1fde..a1f91ff
--- 1/drivers/net/netdevsim/fib.c
--- 2/drivers/net/netdevsim/fib.c
+++ b/drivers/net/netdevsim/fib.c
@@@ -1604,18 -1642,19 +1642,19 @@@ err_data_free
  
  void nsim_fib_destroy(struct devlink *devlink, struct nsim_fib_data *data)
  {
 -      devlink_resource_occ_get_unregister(devlink,
 -                                          NSIM_RESOURCE_NEXTHOPS);
 -      devlink_resource_occ_get_unregister(devlink,
 -                                          NSIM_RESOURCE_IPV6_FIB_RULES);
 -      devlink_resource_occ_get_unregister(devlink,
 -                                          NSIM_RESOURCE_IPV6_FIB);
 -      devlink_resource_occ_get_unregister(devlink,
 -                                          NSIM_RESOURCE_IPV4_FIB_RULES);
 -      devlink_resource_occ_get_unregister(devlink,
 -                                          NSIM_RESOURCE_IPV4_FIB);
 +      devl_resource_occ_get_unregister(devlink,
 +                                       NSIM_RESOURCE_NEXTHOPS);
 +      devl_resource_occ_get_unregister(devlink,
 +                                       NSIM_RESOURCE_IPV6_FIB_RULES);
 +      devl_resource_occ_get_unregister(devlink,
 +                                       NSIM_RESOURCE_IPV6_FIB);
 +      devl_resource_occ_get_unregister(devlink,
 +                                       NSIM_RESOURCE_IPV4_FIB_RULES);
 +      devl_resource_occ_get_unregister(devlink,
 +                                       NSIM_RESOURCE_IPV4_FIB);
        unregister_fib_notifier(devlink_net(devlink), &data->fib_nb);
        unregister_nexthop_notifier(devlink_net(devlink), &data->nexthop_nb);
+       cancel_work_sync(&data->fib_flush_work);
        flush_work(&data->fib_event_work);
        rhashtable_free_and_destroy(&data->fib_rt_ht, nsim_fib_rt_free,
                                    data);

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

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

diff --cc net/ax25/af_ax25.c
index bbac3cb,5b5363c..d82a51e
--- 1/net/ax25/af_ax25.c
--- 2/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@@ -1066,7 -1065,7 +1066,7 @@@ static int ax25_release(struct socket *
                        del_timer_sync(&ax25->t3timer);
                        del_timer_sync(&ax25->idletimer);
                }
-               netdev_put(ax25_dev->dev, &ax25_dev->dev_tracker);
 -              dev_put_track(ax25_dev->dev, &ax25->dev_tracker);
++              netdev_put(ax25_dev->dev, &ax25->dev_tracker);
                ax25_dev_put(ax25_dev);
        }
  
@@@ -1147,7 -1146,7 +1147,7 @@@ static int ax25_bind(struct socket *soc
  
        if (ax25_dev) {
                ax25_fillin_cb(ax25, ax25_dev);
-               netdev_hold(ax25_dev->dev, &ax25_dev->dev_tracker, GFP_ATOMIC);
 -              dev_hold_track(ax25_dev->dev, &ax25->dev_tracker, GFP_ATOMIC);
++              netdev_hold(ax25_dev->dev, &ax25->dev_tracker, GFP_ATOMIC);
        }
  
  done: