Re: [PATCH v2 net-next 00/15] AccECN protocol patch series

[Jakub Kicinski <kuba@kernel.org>]

On Tue, 18 Mar 2025 01:26:55 +0100 chia-yu.chang@nokia-bell-labs.com
wrote:
> From: Chia-Yu Chang <chia-yu.chang@nokia-bell-labs.com>
> 
> Hello,
> 
> Plese find v2:
> 
> v2 (18-03-2025)
> - Add one missing patch from previous AccECN protocol preparation patch series to this patch series
> 
> The full patch series can be found in
> https://github.com/L4STeam/linux-net-next/commits/upstream_l4steam/
> 
> The Accurate ECN draft can be found in
> https://datatracker.ietf.org/doc/html/draft-ietf-tcpm-accurate-ecn-28

Does not apply:

Applying: tcp: fast path functions later
Applying: tcp: AccECN core
Applying: tcp: accecn: AccECN negotiation
error: patch failed: net/ipv4/tcp_output.c:354
error: net/ipv4/tcp_output.c: patch does not apply
Patch failed at 0003 tcp: accecn: AccECN negotiation
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
-- 
pw-bot: cr