Re: linux-next: manual merge of the net-next tree with the net tree
From: Vivian Wang <hidden>
Date: 2026-01-29 02:03:02
Also in:
linux-next, lkml
Hi Mark, On 1/27/26 21:42, Mark Brown wrote:
quoted hunk ↗ jump to hunk
[...] 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