Re: [PATCH net v3] net: spacemit: k1-emac: fix jumbo frame support: manual merge
From: Vivian Wang <hidden>
Date: 2026-02-03 10:25:31
Also in:
linux-riscv, spacemit, stable
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