On Wed, Apr 27, 2016 at 7:51 PM, Gert Doering <g...@greenie.muc.de> wrote: > While I totally love to just merge stuff other folks have reviewed, this > patch just doesn't apply to my tree :-( - and the rejects are too many > to try to mangle by hand. > > Patching file configure.ac using Plan A... > Hunk #1 failed at 291. > Patching file src/openvpn/options.c using Plan A... > Hunk #11 failed at 6584. > Patching file src/openvpn/ssl_verify_polarssl.c using Plan A... > Hunk #2 failed at 35. > Hunk #6 failed at 160. > Hunk #7 failed at 216. > Hunk #8 failed at 232. > Hunk #9 failed at 263. > No such line 417 in input file, ignoring > > > I'm fairly sure I understand why this is happening - Steffan has polar- > related patches in his tree that have not yet been merged - but "as is", > I can't merge this... > > OTOH, it might apply if we get the James-reworked-by-Steffan patch series > in...
This should indeed be the case. -Steffan
