[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAEB7QLBE8OQtvasbDvaeCownALqMcavA2TWOQJG0Sx3Q_-KShw@mail.gmail.com>
Date: Tue, 3 Feb 2026 19:22:30 +0100
From: Tomas Hlavacek <tmshlvck@...il.com>
To: Matthieu Baerts <matttbe@...nel.org>
Cc: netdev@...r.kernel.org, linux-riscv@...ts.infradead.org,
spacemit@...ts.linux.dev, davem@...emloft.net, edumazet@...gle.com,
kuba@...nel.org, pabeni@...hat.com, dlan@...nel.org, wangruikang@...as.ac.cn,
stable@...r.kernel.org, Mark Brown <broonie@...nel.org>
Subject: Re: [PATCH net v3] net: spacemit: k1-emac: fix jumbo frame support:
manual merge
Dear Matthieu,
On Tue, Feb 3, 2026 at 10:39 AM Matthieu Baerts <matttbe@...nel.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
Powered by blists - more mailing lists