Switched to a new branch '20250224-net-mptcp-misc-fixes-v1-0-f550f636b435@kernel.org'
Applying: mptcp: always handle address removal under msk socket lock
Using index info to reconstruct a base tree...
M	net/mptcp/pm_netlink.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/pm_netlink.c
No changes -- Patch already applied.
Applying: mptcp: reset when MPTCP opts are dropped after join
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
CONFLICT (content): Merge conflict in net/mptcp/subflow.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 mptcp: reset when MPTCP opts are dropped after join
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".