]> 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)
commit9bbee1add646204f047c8be467ce9c01f9d793b8
tree9e5e128945eadd50462620927ed915fb88fb6eb1
parentc6a5961f39c402751795b2ea7177441f3b1158b2
parentda114b167b89165e806364ccd421af8fe9fef0cb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicts:

net/ax25/af_ax25.c
  6656b5c2c5a23 ("ax25: fix incorrect dev_tracker usage")
  e124aba2387b4 ("net: rename reference+tracking helpers")

drivers/net/netdevsim/fib.c
  16dfd75c97bc ("netdevsim: fib: Fix reference count leak on route deletion failure")
  26775d787c27 ("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