On Tue, Dec 16, 2025 at 05:39:58AM -0500, 0-day Robot wrote: > Bleep bloop. Greetings Eelco Chaudron, 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 NEWS: Deprecate support for AVX512-optimized features. > 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". > > > Patch skipped due to previous failure. > > Please check this out. If you feel there has been an error, please email > [email protected]
Hi Eelco, I expect this is because I had just applied a conflicting patch to NEWS. Sorry about that. I'm finished with pushing for today (and the year!). Perhaps you can rebase and repost? _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
