Switched to a new branch '20241221-net-mptcp-netlink-specs-pm-doc-fixes-v2-0-e54f2db3f844@kernel.org'
Applying: netlink: specs: mptcp: add missing 'server-side' attr
Using index info to reconstruct a base tree...
M	Documentation/netlink/specs/mptcp_pm.yaml
M	include/uapi/linux/mptcp_pm.h
Falling back to patching base and 3-way merge...
Auto-merging include/uapi/linux/mptcp_pm.h
CONFLICT (content): Merge conflict in include/uapi/linux/mptcp_pm.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
Patch failed at 0001 netlink: specs: mptcp: add missing 'server-side' attr
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".