diff mbox series

[ovs-dev,branch-23.09] ovs: Bump submodule to branch-3.2.

Message ID 20241013085510.84940-1-vlodintsov@k2.cloud
State Superseded
Headers show
Series [ovs-dev,branch-23.09] ovs: Bump submodule to branch-3.2. | expand

Checks

Context Check Description
ovsrobot/apply-robot warning apply and check: warning
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Vladislav Odintsov Oct. 13, 2024, 8:55 a.m. UTC 
From: Dumitru Ceara <dceara@redhat.com>

Specifically the following commit:
  4102674b3e ovsdb-idl: Preserve change_seqno when deleting rows.

Without it, in specific cases, the IDL might incorrectly report deletion
of yet to be seen records.

This commit differs from original by bumping OVS submodule to branch-3.2
related commit ec1d73016 ("ovsdb-idl: Preserve change_seqno when deleting
rows.")

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
Acked-by: Ilya Maximets <i.maximets@ovn.org>
(cherry picked from commit 66ef6709678486f7abf88db10eed15fb72edcc4a)
Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2024-October/417627.html
Signed-off-by: Vladislav Odintsov <vlodintsov@k2.cloud>
---
The current revision differs from original commit referred above:
- ovs submodule commit sha if another
- discarded change at classifier_lookup()
- adjusted commit message

@Dumitru, @Ilya, I'm not aware of a correct handling of Signed-off-by and
Acked-By tags and commit content & message modification when
cherry-picking, just wanted to save credits. So if it is not right to
keep them, or to modify backport so please let me know, I can re-send v2
as a normal non-backport patch.
---
 controller/ofctrl.c | 2 +-
 ovs                 | 2 +-
 tests/test-ovn.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

0-day Robot Oct. 13, 2024, 9:44 a.m. UTC | #1 
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.


checkpatch:
WARNING: Unexpected sign-offs from developers who are not authors or co-authors or committers: Vladislav Odintsov <vlodintsov@k2.cloud>
Lines checked: 63, Warnings: 1, Errors: 0


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
diff mbox series

Patch

diff --git a/controller/ofctrl.c b/controller/ofctrl.c
index 497890eed..718baac18 100644
--- a/controller/ofctrl.c
+++ b/controller/ofctrl.c
@@ -3059,7 +3059,7 @@  ofctrl_inject_pkt(const struct ovsrec_bridge *br_int, const char *flow_s,
     uint64_t packet_stub[128 / 8];
     struct dp_packet packet;
     dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub);
-    flow_compose(&packet, &uflow, NULL, 64);
+    flow_compose(&packet, &uflow, NULL, 64, false);
 
     uint64_t ofpacts_stub[1024 / 8];
     struct ofpbuf ofpacts = OFPBUF_STUB_INITIALIZER(ofpacts_stub);
diff --git a/ovs b/ovs
index c88a35fc2..c2f287013 160000
--- a/ovs
+++ b/ovs
@@ -1 +1 @@ 
-Subproject commit c88a35fc29f0c0eb6189853bfc738c2100d4860f
+Subproject commit c2f287013025ad5b0c40e0c7fc3a9042d4899ce1
diff --git a/tests/test-ovn.c b/tests/test-ovn.c
index 16d2d779d..6f38b1493 100644
--- a/tests/test-ovn.c
+++ b/tests/test-ovn.c
@@ -1238,7 +1238,7 @@  test_expr_to_packets(struct ovs_cmdl_context *ctx OVS_UNUSED)
         uint64_t packet_stub[128 / 8];
         struct dp_packet packet;
         dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub);
-        flow_compose(&packet, &uflow, NULL, 64);
+        flow_compose(&packet, &uflow, NULL, 64, false);
 
         struct ds output = DS_EMPTY_INITIALIZER;
         const uint8_t *buf = dp_packet_data(&packet);