[ovs-dev] [ovs-dev, v3, 2 of 4] conntrack: Fix fragmentation checks.
dlu998 at gmail.com
Fri Jun 29 07:25:25 UTC 2018
yep, test file long line corruption again
On Thu, Jun 28, 2018 at 3:55 PM, 0-day Robot <robot at bytheb.org> 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.
> 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:
> 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