]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 23 Jan 2026 04:13:25 +0000 (20:13 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 30 Jan 2026 01:28:54 +0000 (17:28 -0800)
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>
17 files changed:
1  2 
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/dsa/yt921x.c
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
drivers/net/ethernet/google/gve/gve_ethtool.c
drivers/net/ethernet/google/gve/gve_main.c
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
drivers/net/ethernet/spacemit/k1_emac.c
drivers/net/phy/micrel.c
include/net/bonding.h
net/ipv4/udp_offload.c
net/ipv6/icmp.c
net/ipv6/tcpv6_offload.c
net/mac80211/mlme.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index c85dc742c404df23713f0a49e10b333fb15034b5,88e9424d2d51aa7e3e76c3318172901ec1240c8b..23b6f1531e0c0d6bf244dc7d44d7ee96bf91cd7e
@@@ -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);
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/icmp.c
Simple merge
Simple merge
Simple merge