On 6/27/23 14:36, 0-day Robot wrote: > Bleep bloop. Greetings Ilya Maximets, 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: > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch=diff' to see the failed patch > Patch failed at 0001 Set release date for 2.17.7. > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort".
Hey, Aaron and Michael. Looks like the robot is trying to apply the change to a wrong branch. Could you, please, take a look? This should not block the release, as the patches are trivial, but we need to fix that for future patches. Best regards, Ilya Maximets. _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
