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

[Tomas Hlavacek]

Dear Matthieu,

On Tue, Feb 3, 2026 at 10:39 AM Matthieu Baerts <matttbe at kernel.org> 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