Re: [PATCH net-next v2 0/7] net: deduplicate cookie logic

[Willem de Bruijn <willemdebruijn.kernel@gmail.com>]

Jakub Kicinski wrote:
> On Tue, 11 Feb 2025 21:09:46 -0500 Willem de Bruijn wrote:
> > From: Willem de Bruijn <willemb@google.com>
> > 
> > Reuse standard sk, ip and ipv6 cookie init handlers where possible.
> > 
> > Avoid repeated open coding of the same logic.
> > Harmonize feature sets across protocols.
> > Make IPv4 and IPv6 logic more alike.
> > Simplify adding future new fields with a single init point.
> 
> Sorry for noticing late, looks like this doesn't apply cleanly:
> 
> Applying: tcp: only initialize sockcm tsflags field
> Applying: net: initialize mark in sockcm_init
> Applying: ipv4: initialize inet socket cookies with sockcm_init
> Applying: ipv4: remove get_rttos
> Applying: icmp: reflect tos through ip cookie rather than updating inet_sk
> Using index info to reconstruct a base tree...
> M	net/ipv4/icmp.c
> Falling back to patching base and 3-way merge...
> Auto-merging net/ipv4/icmp.c
> Applying: ipv6: replace ipcm6_init calls with ipcm6_init_sk
> Applying: ipv6: initialize inet socket cookies with sockcm_init
> 
> So CI didn't consume it..
> 
> Could you rebase & repost?

Done. Sorry about that. Not sure what went wrong. I had v2 on top of
netdev-nn/main as of Feb 11, commit ae9b3c0e79bc ("Merge branch
'tcp-allow-to-reduce-max-rto'").

Now rebased on top of current head at commit 412723d54a8b ("Merge
branch 'net-phylink-xpcs-stmmac-support-pcs-eee-configuration'").

Good point that I could have noticed that something was up by looking
at the CI. Will keep that in mind.