Merge branch 'phylink-sfp-updates'