From f527f987ca8db776197928f39619ac6a6bcd07cd Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Oct 22 2024 18:12:12 +0000
Subject: Import openvswitch3.3-3.3.0-55 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index b2465ab..da4b9e6 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -50,7 +50,7 @@ index d8a9722809..d73154a971 100644
      memory: 4G
  
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
-index fc75581486..4a012efd94 100644
+index fc75581486..26f1861e70 100644
 --- a/.github/workflows/build-and-test.yml
 +++ b/.github/workflows/build-and-test.yml
 @@ -2,13 +2,16 @@ name: Build and Test
@@ -68,7 +68,7 @@ index fc75581486..4a012efd94 100644
 -      DPDK_GIT: https://dpdk.org/git/dpdk
 -      DPDK_VER: 23.11
 +      DPDK_GIT: https://dpdk.org/git/dpdk-stable
-+      DPDK_VER: 23.11.1
++      DPDK_VER: 23.11.2
      name: dpdk gcc
      outputs:
        dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }}
@@ -170,7 +170,7 @@ index 085ca2cd67..774eafdb76 100644
  # -- Options for manual page output ---------------------------------------
  
 diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
-index 49b987b610..95ce0bf411 100644
+index 49b987b610..13cc635d04 100644
 --- a/Documentation/faq/releases.rst
 +++ b/Documentation/faq/releases.rst
 @@ -216,11 +216,11 @@ Q: What DPDK version does each Open vSwitch release work with?
@@ -182,16 +182,16 @@ index 49b987b610..95ce0bf411 100644
 -    3.1.x        22.11.4
 -    3.2.x        22.11.4
 -    3.3.x        23.11
-+    2.17.x       21.11.7
-+    3.0.x        21.11.7
-+    3.1.x        22.11.5
-+    3.2.x        22.11.5
-+    3.3.x        23.11.1
++    2.17.x       21.11.8
++    3.0.x        21.11.8
++    3.1.x        22.11.6
++    3.2.x        22.11.6
++    3.3.x        23.11.2
      ============ ========
  
  Q: Are all the DPDK releases that OVS versions work with maintained?
 diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst
-index ad9bdf22c0..93c4a12e75 100644
+index ad9bdf22c0..e22b5676df 100644
 --- a/Documentation/intro/install/dpdk.rst
 +++ b/Documentation/intro/install/dpdk.rst
 @@ -42,7 +42,7 @@ Build requirements
@@ -199,7 +199,7 @@ index ad9bdf22c0..93c4a12e75 100644
  vSwitch with DPDK will require the following:
  
 -- DPDK 23.11
-+- DPDK 23.11.1
++- DPDK 23.11.2
  
  - A `DPDK supported NIC`_
  
@@ -210,9 +210,9 @@ index ad9bdf22c0..93c4a12e75 100644
 -       $ wget https://fast.dpdk.org/rel/dpdk-23.11.tar.xz
 -       $ tar xf dpdk-23.11.tar.xz
 -       $ export DPDK_DIR=/usr/src/dpdk-23.11
-+       $ wget https://fast.dpdk.org/rel/dpdk-23.11.1.tar.xz
-+       $ tar xf dpdk-23.11.1.tar.xz
-+       $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.1
++       $ wget https://fast.dpdk.org/rel/dpdk-23.11.2.tar.xz
++       $ tar xf dpdk-23.11.2.tar.xz
++       $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.2
         $ cd $DPDK_DIR
  
  #. Configure and install DPDK using Meson
@@ -511,12 +511,14 @@ index 94f488d183..23c3417a70 100644
  	  touch $@
  endif
 diff --git a/NEWS b/NEWS
-index 8888fb3ec5..ab7b3df968 100644
+index 8888fb3ec5..2015657d12 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,18 @@
+@@ -1,3 +1,20 @@
 +v3.3.3 - xx xxx xxxx
 +--------------------
++   - DPDK:
++     * OVS validated with DPDK 23.11.2.
 +
 +v3.3.2 - 27 Aug 2024
 +--------------------
diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec
index 9d691b2..b71099a 100644
--- a/SPECS/openvswitch3.3.spec
+++ b/SPECS/openvswitch3.3.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.3.0
-Release: 54%{?dist}
+Release: 55%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -769,6 +769,12 @@ exit 0
 %endif
 
 %changelog
+* Tue Oct 22 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-55
+- Merging upstream branch-3.3 [RH git: 749598021a]
+    Commit list:
+    5d6842f424 dpdk: Use DPDK 23.11.2 release for OVS 3.3.
+
+
 * Mon Oct 07 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-54
 - Merging upstream branch-3.3 [RH git: fecf6343f1]
     Commit list: