linux-kernel - Re: linux-next: manual merge of the net-next tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <d9c8d246-87aa-4a49-be17-4d0a77dc33a3@iscas.ac.cn>
Date: Thu, 29 Jan 2026 10:02:55 +0800
From: Vivian Wang <wangruikang@...as.ac.cn>
To: Mark Brown <broonie@...nel.org>, David Miller <davem@...emloft.net>,
 Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
 Networking <netdev@...r.kernel.org>
Cc: Chukun Pan <amadeus@....edu.cn>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

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