Re: [PATCH net-next v1] tcp: Support skb PAWS drop reason when TIME-WAIT

[Jakub Kicinski]

On Mon, 24 Mar 2025 21:18:05 +0800 Jiayuan Chen wrote:
> When the server actively closes a connection and enters the TIME_WAIT
> state, if PAWS validation fails, the discarded skb previously lacked a
> corresponding reason identifier. This commit assigns the existing
> SKB_DROP_REASON_TCP_RFC7323_PAWS as the reason for such drops.
> 
> We use 'pwru' to capture drop reason.

This patch does not apply cleanly to net-next:

Applying: tcp: Support skb PAWS drop reason when TIME-WAIT
Using index info to reconstruct a base tree...
M	include/net/tcp.h
M	net/ipv4/tcp_ipv4.c
M	net/ipv4/tcp_minisocks.c
M	net/ipv6/tcp_ipv6.c
Falling back to patching base and 3-way merge...
Auto-merging net/ipv6/tcp_ipv6.c
CONFLICT (content): Merge conflict in net/ipv6/tcp_ipv6.c
Auto-merging net/ipv4/tcp_minisocks.c
Auto-merging net/ipv4/tcp_ipv4.c
CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c
Auto-merging include/net/tcp.h
Recorded preimage for 'net/ipv4/tcp_ipv4.c'
Recorded preimage for 'net/ipv6/tcp_ipv6.c'
error: Failed to merge in the changes.
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"
Patch failed at 0001 tcp: Support skb PAWS drop reason when TIME-WAIT
-- 
pw-bot: cr