Message ID | 20241013092313.92774-1-vlodintsov@k2.cloud |
---|---|
State | Changes Requested, archived |
Headers | show |
Series | [ovs-dev,branch-22.12] ovs: Bump submodule to latest OVS branch-3.0. | expand |
Context | Check | Description |
---|---|---|
ovsrobot/apply-robot | fail | apply and check: fail |
Bleep bloop. Greetings Vladislav Odintsov, 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 ovs: Bump submodule to latest OVS branch-3.0. 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 aconole@redhat.com Thanks, 0-day Robot
There was a wrong cherry-pick. v2 with a fix is here: https://patchwork.ozlabs.org/project/ovn/patch/20241013224450.17324-1-vlodintsov@k2.cloud/ On 13.10.2024 15:44, 0-day Robot wrote: > Bleep bloop. Greetings Vladislav Odintsov, 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 ovs: Bump submodule to latest OVS branch-3.0. > 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 aconole@redhat.com > > Thanks, > 0-day Robot
diff --git a/ovs b/ovs index 94191b7a4..a9fb87867 160000 --- a/ovs +++ b/ovs @@ -1 +1 @@ -Subproject commit 94191b7a4926204510931770c52992c9ea24d4e2 +Subproject commit a9fb878679fb08bc3807cf455b0d3ce1797be26d
This picks up the following relevant OVS changes: 876584141 vconn: Always properly free flow stats reply. 2d60ee374 ovsdb-idl: Fix IDL memory leak. 4198bcdfb compiler: Fix errors in Clang 17 ubsan checks. ec048ab62 vlog: Destroy async_append first then close log_fd. dbaf7271c hash, jhash: Fix unaligned access to the hash remainder. 85285fb45 ovs-atomic: Fix inclusion of Clang header by GCC 14. e040f35b2 vconn: Count vconn_sent regardless of log level. ... and others. Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2024-October/417627.html Signed-off-by: Vladislav Odintsov <vlodintsov@k2.cloud> --- ovs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)