On 28/03/2020 12:33, Gert Doering wrote: > Hi, > > On Fri, Mar 27, 2020 at 04:24:00PM +0100, David Sommerseth wrote: >> On 16/11/2019 11:28, Arne Schwabe wrote: >>> Over time some patches slipped in that were not 100% complient to uncrustify >>> This rerun fixes those issues > [..] >> Only done quick code review and RHEL-7 build. Changes looks reasonable and >> is >> by far closer to what I would expect our coding style to look like. >> >> Acked-By: David Sommerseth <dav...@openvpn.net> > > ... but it does not apply to current git master...? > > Applying: Reformat all source files > error: patch failed: src/openvpn/tun.c:3418 > error: src/openvpn/tun.c: patch does not apply > Patch failed at 0001 Reformat all source files
Ahh, sorry ... I did the reviews based on Arne's github tree [1], so I could compile test them. And I trust him enough to not do any stupid stunts in his tree. His icsopenvpn branch has all of the stuff I've reviewed; that branch rebased against our latest master without any hickups. Unfortunately git apply is (rightfully) super picky about conflicts. Not sure now what would be the best approach forward. Picking the commit contents from a rebased icsopenvpn branch would be one way (I can provide commitish references I reviewed, if needed). Another approach is for Arne to resend rebased patches to ML. As we have several patch series lingering in our mail queue, we should look at alternatives pulling in patches which would go smoother and allow a better flexibility for all of us (submitter, reviewer and committer) while keeping the review and commit process decentralized. But that's a longer discussion we need to take in a different place than this thread. [1] <https://github.com/schwabe/openvpn> -- kind regards, David Sommerseth OpenVPN Inc
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
