Switched to a new branch '20220116001259.203319-1-dmytro@shytyi.net'
Applying: net: mptcp, Fast Open Mechanism
Using index info to reconstruct a base tree...
M	include/linux/tcp.h
M	net/ipv4/inet_connection_sock.c
M	net/ipv4/tcp_input.c
M	net/mptcp/protocol.c
M	net/mptcp/sockopt.c
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
Auto-merging net/mptcp/sockopt.c
CONFLICT (content): Merge conflict in net/mptcp/sockopt.c
Auto-merging net/mptcp/protocol.c
Auto-merging net/ipv4/tcp_input.c
Auto-merging net/ipv4/inet_connection_sock.c
Auto-merging include/linux/tcp.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net: mptcp, Fast Open Mechanism
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".
Failed to apply patch:
[PATCH net-next v2] net: mptcp, Fast Open Mechanism