Ben Pfaff <b...@ovn.org> writes: > The bot couldn't apply this patch presumably because it tried to apply > it against master. Maybe the bot should notice version numbers in  in > subject lines and try against that branch.
Good call. I'm at a conference at the moment, but will try to get that integrated this week. I expect there will be branch-2.10 and earlier. > Thanks, > > Ben. > > On Wed, Jul 11, 2018 at 11:59:24AM -0400, 0-day Robot 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. >> >> >> git-am: >> Failed to merge in the changes. >> Patch failed at 0001 conntrack: Fix conn_update_state_alg use after free. >> 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 >> _______________________________________________ >> dev mailing list >> d...@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev