[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250324120905.06dcabd4@kernel.org>
Date: Mon, 24 Mar 2025 12:09:05 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: chia-yu.chang@...ia-bell-labs.com
Cc: netdev@...r.kernel.org, dave.taht@...il.com, pabeni@...hat.com,
jhs@...atatu.com, stephen@...workplumber.org, xiyou.wangcong@...il.com,
jiri@...nulli.us, davem@...emloft.net, edumazet@...gle.com,
horms@...nel.org, andrew+netdev@...n.ch, donald.hunter@...il.com,
ast@...erby.net, liuhangbin@...il.com, shuah@...nel.org,
linux-kselftest@...r.kernel.org, ij@...nel.org, ncardwell@...gle.com,
koen.de_schepper@...ia-bell-labs.com, g.white@...lelabs.com,
ingemar.s.johansson@...csson.com, mirja.kuehlewind@...csson.com,
cheshire@...le.com, rs.ietf@....at, Jason_Livingood@...cast.com,
vidhi_goel@...le.com
Subject: Re: [PATCH v2 net-next 00/15] AccECN protocol patch series
On Tue, 18 Mar 2025 01:26:55 +0100 chia-yu.chang@...ia-bell-labs.com
wrote:
> From: Chia-Yu Chang <chia-yu.chang@...ia-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
Powered by blists - more mailing lists