netdev - Re: [PATCH net v3] net: spacemit: k1-emac: fix jumbo frame support: manual merge

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: <140cb690-caa2-4c94-8b4a-75c0d89e2056@iscas.ac.cn>
Date: Tue, 3 Feb 2026 18:25:14 +0800
From: Vivian Wang <wangruikang@...as.ac.cn>
To: Matthieu Baerts <matttbe@...nel.org>, Tomas Hlavacek
 <tmshlvck@...il.com>, netdev@...r.kernel.org
Cc: linux-riscv@...ts.infradead.org, spacemit@...ts.linux.dev,
 davem@...emloft.net, edumazet@...gle.com, kuba@...nel.org,
 pabeni@...hat.com, dlan@...nel.org, stable@...r.kernel.org,
 Mark Brown <broonie@...nel.org>
Subject: Re: [PATCH net v3] net: spacemit: k1-emac: fix jumbo frame support:
 manual merge

Hi Matthieu and Mark,

On 2/3/26 17:39, Matthieu Baerts wrote:
> [...]
>
> The conflict has been resolved on our side [1] and the resolution we
> suggest is attached to this email. Please report any issues linked to
> this conflict resolution as it might be used by others. If you worked on
> the mentioned patches, don't hesitate to ACK this conflict resolution.
> ---------------------------

Your merge is correct. Thanks for handling it.

Vivian "dramforever" Wang