Thanks Some long lines in the test file are leading to subsequent corruption in the patch I fixed it and will resend
Darrell On Wed, Jun 27, 2018 at 11:54 PM, 0-day Robot <[email protected]> wrote: > Bleep bloop. Greetings Darrell Ball, I am a robot and I have tried out > your patch. > Thanks for your contribution. > > I encountered some error that I wasn't expecting. See the details below. > > > git-am: > fatal: corrupt patch at line 307 > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 conntrack: Fix fragmentation checks. > The copy of the patch that failed is found in: > /var/lib/jenkins/jobs/upstream_build_from_pw/ > workspace/.git/rebase-apply/patch > When you have resolved this problem, run "git am --resolved". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > > Please check this out. If you feel there has been an error, please email > [email protected] > > Thanks, > 0-day Robot > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
