Switched to a new branch '20240506-upstream-net-20240506-mptcp-sched-exist-v1-1-2ed1529e521e@kernel.org'
Applying: mptcp: only allow set existing scheduler for net.mptcp.scheduler
Using index info to reconstruct a base tree...
M	net/mptcp/ctrl.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/ctrl.c
CONFLICT (content): Merge conflict in net/mptcp/ctrl.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: only allow set existing scheduler for net.mptcp.scheduler
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".