Switched to a new branch 'cover.1737702298.git.tanggeliang@kylinos.cn'
Applying: mptcp: add a build check for userspace_pm_dump_addr
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
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
Applying: mptcp: add mptcp_pm_genl_fill_addr helper
Using index info to reconstruct a base tree...
M	net/mptcp/pm.c
M	net/mptcp/pm_netlink.c
M	net/mptcp/pm_userspace.c
M	net/mptcp/protocol.h
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
Auto-merging net/mptcp/pm_netlink.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 mptcp: add mptcp_pm_genl_fill_addr helper
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".