On Mon, Aug 13, 2018 at 1:06 AM, 0-day Robot <ro...@bytheb.org> wrote: > > 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 (tests/ovn-performance.at). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 ovn-performance.at: Test port group incremental 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 acon...@bytheb.org > > Thanks, > 0-day Robot
This should not fail if patching following the order of the patch series, unless it skipped the 2 patches authored by Jakub. _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
