Switched to a new branch '20240510-upstream-net-next-20240509-misc-improvements-v1-0-4f25579e62ba@kernel.org'
Applying: mptcp: SO_KEEPALIVE: fix getsockopt support
Using index info to reconstruct a base tree...
M	net/mptcp/sockopt.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/sockopt.c
No changes -- Patch already applied.
Applying: mptcp: fix full TCP keep-alive support
Using index info to reconstruct a base tree...
M	net/mptcp/protocol.h
M	net/mptcp/sockopt.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/sockopt.c
Auto-merging net/mptcp/protocol.h
No changes -- Patch already applied.
Applying: mptcp: sockopt: info: stop early if no buffer
Using index info to reconstruct a base tree...
M	net/mptcp/sockopt.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/sockopt.c
CONFLICT (content): Merge conflict in net/mptcp/sockopt.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: sockopt: info: stop early if no buffer
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".