Switched to a new branch '20230916-upstream-net-20230915-mptcp-hanging-conn-v1-0-05d1a8b851a8@tessares.net'
Applying: mptcp: fix bogus receive window shrinkage with multiple subflows
Using index info to reconstruct a base tree...
M	net/mptcp/options.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: mptcp: move __mptcp_error_report in protocol.c
Using index info to reconstruct a base tree...
M	net/mptcp/protocol.c
M	net/mptcp/subflow.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/subflow.c
Auto-merging net/mptcp/protocol.c
CONFLICT (content): Merge conflict in net/mptcp/protocol.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: move __mptcp_error_report in protocol.c
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".