On Fri, Mar 08, 2019 at 09:55:34AM +0100, Jiri Pirko wrote:
Tue, Mar 05, 2019 at 04:41:56AM CET, liuhangbin(a)gmail.com wrote:
>As we don't have a default value for link_watch.interval. If user
>forgot to set this parameter, teamd will failed to init port priv and
>exit at the end.
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
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".
That's weird, I can apply this patch correctly on current HEAD
547a4dc (HEAD -> master) teamd: add a default value 1000 for link_watch.interval
5f35530 (origin/master, origin/HEAD) teamd: lw: arp_ping: only check arp reply message