Switched to a new branch '20250912-net-mptcp-pm-uspace-deny._5Fjoin._5Fid0-v1-0-40171884ade8@kernel.org'
Applying: mptcp: set remote_deny_join_id0 on SYN recv
Using index info to reconstruct a base tree...
M	net/mptcp/subflow.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/subflow.c
No changes -- Patch already applied.
Applying: mptcp: pm: nl: announce deny-join-id0 flag
Using index info to reconstruct a base tree...
M	Documentation/netlink/specs/mptcp_pm.yaml
M	include/uapi/linux/mptcp.h
M	include/uapi/linux/mptcp_pm.h
M	net/mptcp/pm_netlink.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/pm_netlink.c
Auto-merging include/uapi/linux/mptcp_pm.h
CONFLICT (content): Merge conflict in include/uapi/linux/mptcp_pm.h
Auto-merging include/uapi/linux/mptcp.h
CONFLICT (content): Merge conflict in include/uapi/linux/mptcp.h
Auto-merging Documentation/netlink/specs/mptcp_pm.yaml
CONFLICT (content): Merge conflict in Documentation/netlink/specs/mptcp_pm.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 mptcp: pm: nl: announce deny-join-id0 flag