Conflicts: net/ax25/af_ax25.cd7c4c9e075
("ax25: fix incorrect dev_tracker usage")d62607c3fe
("net: rename reference+tracking helpers") drivers/net/netdevsim/fib.c180a6a3ee6
("netdevsim: fib: Fix reference count leak on route deletion failure")012ec02ae4
("netdevsim: convert driver to use unlocked devlink API during init/fini") Signed-off-by: Paolo Abeni <pabeni@redhat.com>