Fixes: 2b30f8291a30 ("net: ethtool: add support for MAC Merge layer")
Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
 net/ethtool/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile
index a1490c4afe6b..1e493553b977 100644
--- a/net/ethtool/Makefile
+++ b/net/ethtool/Makefile
@@ -8,5 +8,5 @@ ethtool_nl-y	:= netlink.o bitset.o strset.o linkinfo.o linkmodes.o rss.o \
 		   linkstate.o debug.o wol.o features.o privflags.o rings.o \
 		   channels.o coalesce.o pause.o eee.o tsinfo.o cabletest.o \
 		   tunnels.o fec.o eeprom.o stats.o phc_vclocks.o mm.o \
-		   module.o cmis_fw_update.o cmis_cdb.o pse-pd.o plca.o mm.o \
+		   module.o cmis_fw_update.o cmis_cdb.o pse-pd.o plca.o \
 		   phy.o tsconfig.o

base-commit: 203e3beb73e53584ca90bc2a6d8240b9b12b9bcf
-- 
2.43.0

On Fri, Sep 26, 2025 at 03:13:23PM +0200, Markus Heidelberg wrote:
> Fixes: 2b30f8291a30 ("net: ethtool: add support for MAC Merge layer")
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> ---
>  net/ethtool/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile
> index a1490c4afe6b..1e493553b977 100644
> --- a/net/ethtool/Makefile
> +++ b/net/ethtool/Makefile
> @@ -8,5 +8,5 @@ ethtool_nl-y    := netlink.o bitset.o strset.o linkinfo.o linkmodes.o rss.o \
>                    linkstate.o debug.o wol.o features.o privflags.o rings.o \
>                    channels.o coalesce.o pause.o eee.o tsinfo.o cabletest.o \
>                    tunnels.o fec.o eeprom.o stats.o phc_vclocks.o mm.o \
> -                  module.o cmis_fw_update.o cmis_cdb.o pse-pd.o plca.o mm.o \
> +                  module.o cmis_fw_update.o cmis_cdb.o pse-pd.o plca.o \
>                    phy.o tsconfig.o
> 
> base-commit: 203e3beb73e53584ca90bc2a6d8240b9b12b9bcf
> --
> 2.43.0
>

Must have been an incorrect merge resolution on my side. Thanks for catching.

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>