[ovs-dev] [ovs-dev, v5, 08 of 20] ovn-controller: Incremental logical flow processing

Aaron Conole aconole at redhat.com
Mon Aug 13 18:45:14 UTC 2018


0-day Robot <robot at bytheb.org> writes:

> Bleep bloop.  Greetings Han Zhou, 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: sha1 information is lacking or useless (ovn/controller/lflow.c).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 ovn-controller: Incremental logical flow processing
> 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 aconole at bytheb.org
>
> Thanks,
> 0-day Robot

Ignore this.

Same issue as before.


More information about the dev mailing list