Re: [PATCH net-next v3 00/10] net: pcs: xpcs: Add memory-mapped device support

[Vladimir Oltean <olteanv@gmail.com>]

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

Thanks,
Vladimir