On Wed, Apr 17, 2019 at 09:34:50AM +0200, Jiri Pirko wrote:
>Hi Jiri,
>
>Do I need to re-send the patch and let you have a try again?
Applying: teamd: add a default value 1000 for link_watch.interval
error: patch failed: man/teamd.conf.5:308
error: man/teamd.conf.5: patch does not apply
error: patch failed: teamd/teamd_lw_psr.c:28
error: teamd/teamd_lw_psr.c: patch does not apply
Patch failed at 0001 teamd: add a default value 1000 for link_watch.interval
hint: Use 'git am --show-current-patch' to see the failed patch
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".
Please generate and send again.
Hmm, that's really weird. I will ask Xin Long help post the patch.
Thanks
Hangbin