On Fri, Mar 08, 2019 at 12:59:22PM +0100, Jiri Pirko wrote:
>> 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
Try now with head f36c191da3d65a4744582b2eb09fa297dd85f9ae
Still works
$ git am
~/Mail/incoming/_patchv2_libteam_teamd_add_a_default_value_1000_for_link_watch.interva.patch
Applying: teamd: add a default value 1000 for link_watch.interval
$ git log --oneline | head -2
2863d2e teamd: add a default value 1000 for link_watch.interval
f36c191 man: fix runner.min_ports default value
Thanks
Hangbin