]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorPaolo Abeni <pabeni@redhat.com>
Wed, 3 Aug 2022 06:50:42 +0000 (08:50 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Wed, 3 Aug 2022 07:04:55 +0000 (09:04 +0200)
commitd830cea7abe8ca674d2be3d93455cb90a3651411
tree9e5e128945eadd50462620927ed915fb88fb6eb1
parent705df3d5048434f152c78a11174025c3b527c84b
parentb75d284319e419fdd6ab7320bd61f4d12627695d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicts:

net/ax25/af_ax25.c
  8e678f03e1b2b ("ax25: fix incorrect dev_tracker usage")
  ff17dcc4b8f27 ("net: rename reference+tracking helpers")

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

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/intel/iavf/iavf.h
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/netdevsim/fib.c
drivers/net/usb/ax88179_178a.c
include/net/xdp_sock_drv.h
net/ax25/af_ax25.c