Switched to a new branch '20240731-upstream-net-20240731-mptcp-endp-subflow-signal-v1-0-c8a9b036493b@kernel.org'
Applying: mptcp: fully established after ADD_ADDR echo on MPJ
Using index info to reconstruct a base tree...
M	net/mptcp/options.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/options.c
No changes -- Patch already applied.
Applying: mptcp: pm: deny endp with signal + subflow + port
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: pm: reduce indentation blocks
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 0003 mptcp: pm: reduce indentation blocks
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".