From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 23 Jan 2026 04:13:25 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a010fe8d869635fd15c1d5768ba6a2f48795fa36;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.19-rc8).

No adjacent changes, conflicts:

drivers/net/ethernet/spacemit/k1_emac.c
  2c84959167d64 ("net: spacemit: Check for netif_carrier_ok() in emac_stats_update()")
  f66086798f91f ("net: spacemit: Remove broken flow control support")
https://lore.kernel.org/aXjAqZA3iEWD_DGM@sirena.org.uk

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

a010fe8d869635fd15c1d5768ba6a2f48795fa36
diff --cc drivers/net/ethernet/spacemit/k1_emac.c
index c85dc742c404d,88e9424d2d51a..23b6f1531e0c0
--- a/drivers/net/ethernet/spacemit/k1_emac.c
+++ b/drivers/net/ethernet/spacemit/k1_emac.c
@@@ -1531,6 -1648,14 +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);