Switched to a new branch '20250218-net-next-mptcp-rx-path-refactor-v1-0-4a47d90d7998@kernel.org'
Applying: mptcp: consolidate subflow cleanup
Using index info to reconstruct a base tree...
M	net/mptcp/subflow.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/subflow.c
No changes -- Patch already applied.
Applying: mptcp: drop __mptcp_fastopen_gen_msk_ackseq()
Using index info to reconstruct a base tree...
M	net/mptcp/fastopen.c
M	net/mptcp/protocol.c
M	net/mptcp/protocol.h
M	net/mptcp/subflow.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/protocol.h
Auto-merging net/mptcp/protocol.c
Auto-merging net/mptcp/fastopen.c
No changes -- Patch already applied.
Applying: mptcp: move the whole rx path under msk socket lock protection
Using index info to reconstruct a base tree...
M	net/mptcp/fastopen.c
M	net/mptcp/protocol.c
M	net/mptcp/protocol.h
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/protocol.h
Auto-merging net/mptcp/protocol.c
CONFLICT (content): Merge conflict in net/mptcp/protocol.c
Auto-merging net/mptcp/fastopen.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 mptcp: move the whole rx path under msk socket lock protection
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".