Re: [PATCH net v3] net: spacemit: k1-emac: fix jumbo frame support: manual merge
From: Tomas Hlavacek <hidden>
Date: 2026-02-03 18:22:42
Also in:
linux-riscv, spacemit, stable
Dear Matthieu, On Tue, Feb 3, 2026 at 10:39 AM Matthieu Baerts [off-list ref] 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.
It looks good to me. Thank you! Tomas