[ovs-dev] [PATCH] tests: Add check for correct l3l4 conntrack frag reassembly
robot at bytheb.org
Thu Oct 3 15:57:08 UTC 2019
Bleep bloop. Greetings Greg Rose, 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: corrupt patch at line 43
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 tests: Add check for correct l3l4 conntrack frag reassembly
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 redhat.com
More information about the dev