No conflicts. Build issue in drivers/net/ethernet/sfc/ptp.c54fccfdd7c
("sfc: efx_default_channel_type APIs can be static")49e6123c65
("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>