Switched to a new branch 'cover.1776466833.git.tanggeliang@kylinos.cn'
Applying: mptcp: pm: userspace: drop delete_local_addr helper
Using index info to reconstruct a base tree...
M	net/mptcp/pm_userspace.c
Falling back to patching base and 3-way merge...
Auto-merging net/mptcp/pm_userspace.c
CONFLICT (content): Merge conflict in net/mptcp/pm_userspace.c
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 0001 mptcp: pm: userspace: drop delete_local_addr helper