[ovs-dev] ofproto: Return error codes for Rule insertions

0-day Robot robot at bytheb.org
Sun Jul 8 11:54:15 UTC 2018

Bleep bloop.  Greetings Aravind Prasad, 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.

fatal: patch fragment without header at line 7: @@ -270,7 +272,7 @@ static enum ofperr ofproto_flow_mod_start(struct
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 ofproto: Return error codes for Rule insertions
The copy of the patch that failed is found in:
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

0-day Robot

More information about the dev mailing list