Switched to a new branch '20250221-net-next-mptcp-pm-misc-cleanup-3-v1-0-2b70ab1cee79@kernel.org'
Applying: mptcp: pm: remove unused ret value to set flags
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
CONFLICT (content): Merge conflict in net/mptcp/pm_netlink.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 mptcp: pm: remove unused ret value to set flags
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".