Hi Vladimir On Thu, Jun 27, 2024 at 02:10:34PM +0300, Vladimir Oltean wrote: > Hi Sergey, > > This does not apply to net-next. > > Applying: net: pcs: xpcs: Move native device ID macro to linux/pcs/pcs-xpcs.h > Applying: net: pcs: xpcs: Split up xpcs_create() body to sub-functions > Applying: net: pcs: xpcs: Convert xpcs_id to dw_xpcs_desc > Applying: net: pcs: xpcs: Convert xpcs_compat to dw_xpcs_compat > Applying: net: pcs: xpcs: Introduce DW XPCS info structure > Applying: dt-bindings: net: Add Synopsys DW xPCS bindings > Applying: net: pcs: xpcs: Add Synopsys DW xPCS platform device driver > Applying: net: pcs: xpcs: Add fwnode-based descriptor creation method > Applying: net: stmmac: Create DW XPCS device with particular address > Using index info to reconstruct a base tree... > M drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c > M include/linux/stmmac.h > Checking patch drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c... > Checking patch drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c... > Checking patch include/linux/stmmac.h... > Applied patch drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c cleanly. > Applied patch drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c cleanly. > Applied patch include/linux/stmmac.h cleanly. > Falling back to patching base and 3-way merge... > error: Your local changes to the following files would be overwritten by merge: > drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c > drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > include/linux/stmmac.h > Please commit your changes or stash them before you merge. > Aborting > error: Failed to merge in the changes. > Patch failed at 0009 net: stmmac: Create DW XPCS device with particular address > hint: Use 'git am --show-current-patch=diff' to see the failed patch Argg, right! I forgot to port the Russell' latest series introduced the select_pcs() callback. Sorry for the inconvenience. I'll get it merged in my repo (based on the kernel upstream tree with verious plat-specific fixes) and test it out again. Then I'll _make sure_ this time that the series is applicable onto the net-next tree before resubmitting. Thanks, -Serge(y) > > Thanks, > Vladimir
