Rebased to main to fix the merge conflict and sent v2

On Tue, Feb 27, 2024 at 1:59 PM 0-day Robot <[email protected]> wrote:

> Bleep bloop.  Greetings aginwala aginwala, 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 ovn-ctl: Add ssl-ciphers and protocols support.
> 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".
>
>
> Please check this out.  If you feel there has been an error, please email
> [email protected]
>
> Thanks,
> 0-day Robot
> _______________________________________________
> dev mailing list
> [email protected]
>
> https://urldefense.com/v3/__https://mail.openvswitch.org/mailman/listinfo/ovs-dev__;!!IKRxdwAv5BmarQ!eOSIT8GnMYrVWmSdJS1e2FXqNQQZqAF7f_eG4sDeOgKzQMV9gJ2Ek4Jx844LlGLt35hBBabz40NlbX518Gc$
>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to