Re: [PATCH v2 net-next 2/2] tcp/dccp: remove icsk->icsk_ack.timeout

[Simon Horman <horms@kernel.org>]

On Thu, Mar 20, 2025 at 08:00:29PM +0100, Eric Dumazet wrote:
> On Thu, Mar 20, 2025 at 7:39 PM Simon Horman <horms@kernel.org> wrote:
> >
> > On Tue, Mar 18, 2025 at 03:43:59PM +0000, Eric Dumazet wrote:
> > > icsk->icsk_ack.timeout can be replaced by icsk->csk_delack_timer.expires
> > >
> > > This saves 8 bytes in TCP/DCCP sockets and helps for better cache locality.
> > >
> > > Signed-off-by: Eric Dumazet <edumazet@google.com>
> > > Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> > > ---
> > > v2: rebase after "tcp: cache RTAX_QUICKACK metric in a hot cache line"
> >
> > Hi Eric,
> >
> > I hate to be a bore, but patch 2/2 does seem to apply to net-next.
> 
> Hmm, what is the message you have ?
> 
> It applies fine here.

Ok, there must be something weird going on in my environment.

FTR, I see this:

$ git checkout net-next/main
HEAD is now at 6855b9be9cf7 Merge branch 'mptcp-pm-prep-work-for-new-ops-and-sysctl-knobs'

$ b4 mbox 20250318154359.778438-1-edumazet@google.com
Grabbing thread from lore.kernel.org/all/20250318154359.778438-1-edumazet@google.com/t.mbox.gz
5 messages in the thread
Saved ./20250318154359.778438-1-edumazet@google.com.mbx

$ git am ./20250318154359.778438-1-edumazet@google.com.mbx
Applying: tcp/dccp: remove icsk->icsk_ack.timeout
error: corrupt patch at line 31
Patch failed at 0001 tcp/dccp: remove icsk->icsk_ack.timeout
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 advice.mergeConflict false"