Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/spacemit/k1_emac.c

between commit:

  2c84959167d64 ("net: spacemit: Check for netif_carrier_ok() in emac_stats_update()")

from the net tree and commit:

  f66086798f91f ("net: spacemit: Remove broken flow control support")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/net/ethernet/spacemit/k1_emac.c
index 88e9424d2d51a,c85dc742c404d..0000000000000
--- a/drivers/net/ethernet/spacemit/k1_emac.c
+++ b/drivers/net/ethernet/spacemit/k1_emac.c
@@@ -1648,14 -1531,6 +1545,12 @@@ static void emac_adjust_link(struct net
  		}
  
  		emac_wr(priv, MAC_GLOBAL_CONTROL, ctrl);
 +
- 		emac_set_fc_autoneg(priv);
- 
 +		/*
 +		 * Reschedule stats updates now that link is up. See comments in
 +		 * emac_stats_update().
 +		 */
 +		mod_timer(&priv->stats_timer, jiffies);
  	}
  
  	phy_print_status(phydev);

Hi Mark,

On 1/27/26 21:42, Mark Brown wrote:
> [...]
>
> diff --cc drivers/net/ethernet/spacemit/k1_emac.c
> index 88e9424d2d51a,c85dc742c404d..0000000000000
> --- a/drivers/net/ethernet/spacemit/k1_emac.c
> +++ b/drivers/net/ethernet/spacemit/k1_emac.c
> @@@ -1648,14 -1531,6 +1545,12 @@@ static void emac_adjust_link(struct net
>   		}
>   
>   		emac_wr(priv, MAC_GLOBAL_CONTROL, ctrl);
>  +
> - 		emac_set_fc_autoneg(priv);
> - 
>  +		/*
>  +		 * Reschedule stats updates now that link is up. See comments in
>  +		 * emac_stats_update().
>  +		 */
>  +		mod_timer(&priv->stats_timer, jiffies);
>   	}
>   
>   	phy_print_status(phydev);

This merge is correct.

Thanks,
Vivian "dramforever" Wang