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

Conflicts:

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

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

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