Kaloyan - I just tried applying this patch to the latest tree in order to pick it up:
sharpd@Robot:~/pq6$ pwclient git-am 1364 Applying patch #1364 using 'git am' Description: [quagga-dev,13185] Re: CI runs for proposed patches, round 3 Applying: CI runs for proposed patches, round 3 /home/sharpd/pq6/.git/rebase-apply/patch:571: trailing whitespace. * /home/sharpd/pq6/.git/rebase-apply/patch:573: trailing whitespace. * /home/sharpd/pq6/.git/rebase-apply/patch:579: trailing whitespace. * /home/sharpd/pq6/.git/rebase-apply/patch:581: trailing whitespace. * /home/sharpd/pq6/.git/rebase-apply/patch:585: trailing whitespace. * error: patch failed: lib/zclient.c:537 error: lib/zclient.c: patch does not apply error: patch failed: lib/zclient.h:93 error: lib/zclient.h: patch does not apply error: patch failed: zebra/connected.c:192 error: zebra/connected.c: patch does not apply error: patch failed: zebra/kernel_socket.c:963 error: zebra/kernel_socket.c: patch does not apply error: patch failed: zebra/rib.h:199 error: zebra/rib.h: patch does not apply error: patch failed: zebra/rt_netlink.c:730 error: zebra/rt_netlink.c: patch does not apply error: patch failed: zebra/zebra_rib.c:1806 error: zebra/zebra_rib.c: patch does not apply error: patch failed: zebra/zserv.c:905 error: zebra/zserv.c: patch does not apply Patch failed at 0001 CI runs for proposed patches, round 3 When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". sharpd@Robot:~/pq6$ When you get a chance can you update this patch forward to what is on master now? thanks! donald On Fri, Sep 25, 2015 at 11:33 AM, Kaloyan Kovachev <[email protected]> wrote: > And here it is: > > https://github.com/KaloNK/quagga/commit/fefc5bb127ea5575d2267e9f0feb403dbaf454f3 > > Also attached here as single file with all the commits as from > https://github.com/KaloNK/quagga/compare/master...realms_patchset.diff > > > > On 2015-09-25 18:01, Kaloyan Kovachev wrote: > >> >> When i remove conditional compilation from the rest of the code >> (except rt_name.c), will prepare a new diff with all the changes as >> single file. >> >> > _______________________________________________ > Quagga-dev mailing list > [email protected] > https://lists.quagga.net/mailman/listinfo/quagga-dev >
_______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
