[ovs-dev] [ovs-dev, v4, 1 of 3] conntrack: Fix fragmentation checks.
robot at bytheb.org
Fri Jun 29 07:54:23 UTC 2018
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.
error: patch failed: tests/system-traffic.at:2235
error: tests/system-traffic.at: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
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:
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
More information about the dev