Switched to a new branch '20240716-upstream-net-next-20240716-tcp-3rd-ack-consume-sk._5Fsocket-v1-1-4e61d0b79233@kernel.org'
Applying: tcp: process the 3rd ACK with sk_socket for for TFO/MPTCP
Using index info to reconstruct a base tree...
M	net/ipv4/tcp_input.c
Falling back to patching base and 3-way merge...
Auto-merging net/ipv4/tcp_input.c
CONFLICT (content): Merge conflict in net/ipv4/tcp_input.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 tcp: process the 3rd ACK with sk_socket for for TFO/MPTCP
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".