On 16 May 2022, at 18:04, 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' to see the failed patch > Patch failed at 0001 tests: Add check_pkt_len action test to > system-offload-traffic. > 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]
This failure was due to a merge conflict in the NEWS file. I will not send a v4 for now as this will continue to happen. If the maintainers do want a v4, I'll send it. //Eelco _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
