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

No conflicts.

Build issue in drivers/net/ethernet/sfc/ptp.c
  54fccfdd ("sfc: efx_default_channel_type APIs can be static")
  49e6123c ("net: sfc: fix memory leak due to ptp channel")
https://lore.kernel.org/all/20220510130556.52598fe2@canb.auug.org.au/



Signed-off-by: Jakub Kicinski <kuba@kernel.org>