From c6a98e3508466d0795ce9bf27e1052818c945961 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Oct 22 2024 17:09:21 +0000
Subject: Import openvswitch3.2-3.2.0-104 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch
index 9eec134..e1bc4f9 100644
--- a/SOURCES/openvswitch-3.2.0.patch
+++ b/SOURCES/openvswitch-3.2.0.patch
@@ -52,7 +52,7 @@ index 48931fa085..d73154a971 100644
      memory: 4G
  
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
-index 47d239f108..951e7e3217 100644
+index 47d239f108..de3ba3584d 100644
 --- a/.github/workflows/build-and-test.yml
 +++ b/.github/workflows/build-and-test.yml
 @@ -2,22 +2,25 @@ name: Build and Test
@@ -69,7 +69,7 @@ index 47d239f108..951e7e3217 100644
        CC: gcc
        DPDK_GIT: https://dpdk.org/git/dpdk-stable
 -      DPDK_VER: 22.11.1
-+      DPDK_VER: 22.11.5
++      DPDK_VER: 22.11.6
      name: dpdk gcc
      outputs:
        dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }}
@@ -308,7 +308,7 @@ index 9186e1ad22..f58bf1c853 100644
  DK Moon
  Ding Zhi                        zhi.ding@6wind.com
 diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
-index e6bda14e7b..2be9b501c2 100644
+index e6bda14e7b..7843c6e83b 100644
 --- a/Documentation/faq/releases.rst
 +++ b/Documentation/faq/releases.rst
 @@ -215,10 +215,10 @@ Q: What DPDK version does each Open vSwitch release work with?
@@ -319,15 +319,15 @@ index e6bda14e7b..2be9b501c2 100644
 -    3.0.x        21.11.2
 -    3.1.x        22.11.1
 -    3.2.x        22.11.1
-+    2.17.x       21.11.7
-+    3.0.x        21.11.7
-+    3.1.x        22.11.5
-+    3.2.x        22.11.5
++    2.17.x       21.11.8
++    3.0.x        21.11.8
++    3.1.x        22.11.6
++    3.2.x        22.11.6
      ============ ========
  
  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 63a0ebb23b..a9921ae426 100644
+index 63a0ebb23b..15b3079be5 100644
 --- a/Documentation/intro/install/dpdk.rst
 +++ b/Documentation/intro/install/dpdk.rst
 @@ -42,7 +42,7 @@ Build requirements
@@ -335,7 +335,7 @@ index 63a0ebb23b..a9921ae426 100644
  vSwitch with DPDK will require the following:
  
 -- DPDK 22.11.1
-+- DPDK 22.11.5
++- DPDK 22.11.6
  
  - A `DPDK supported NIC`_
  
@@ -346,9 +346,9 @@ index 63a0ebb23b..a9921ae426 100644
 -       $ wget https://fast.dpdk.org/rel/dpdk-22.11.1.tar.xz
 -       $ tar xf dpdk-22.11.1.tar.xz
 -       $ export DPDK_DIR=/usr/src/dpdk-stable-22.11.1
-+       $ wget https://fast.dpdk.org/rel/dpdk-22.11.5.tar.xz
-+       $ tar xf dpdk-22.11.5.tar.xz
-+       $ export DPDK_DIR=/usr/src/dpdk-stable-22.11.5
++       $ wget https://fast.dpdk.org/rel/dpdk-22.11.6.tar.xz
++       $ tar xf dpdk-22.11.6.tar.xz
++       $ export DPDK_DIR=/usr/src/dpdk-stable-22.11.6
         $ cd $DPDK_DIR
  
  #. Configure and install DPDK using Meson
@@ -489,12 +489,14 @@ index db341504d3..23c3417a70 100644
  	@if cmp -s $(@F).tmp $@; then \
  	  touch $@; \
 diff --git a/NEWS b/NEWS
-index a3a5c2e4a2..492b096db6 100644
+index a3a5c2e4a2..577c03e19f 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,24 @@
+@@ -1,3 +1,26 @@
 +v3.2.4 - xx xxx xxxx
 +--------------------
++   - DPDK:
++     * OVS validated with DPDK 22.11.6.
 +
 +v3.2.3 - 07 Jun 2024
 +--------------------
diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec
index 5774f57..e71736a 100644
--- a/SPECS/openvswitch3.2.spec
+++ b/SPECS/openvswitch3.2.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.2.0
-Release: 103%{?dist}
+Release: 104%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -763,6 +763,12 @@ exit 0
 %endif
 
 %changelog
+* Tue Oct 22 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-104
+- Merging upstream branch-3.2 [RH git: 993e402bf2]
+    Commit list:
+    b65cd33bf4 dpdk: Use DPDK 22.11.6 release for OVS 3.2.
+
+
 * Mon Oct 07 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-103
 - Merging upstream branch-3.2 [RH git: 988c5180d6]
     Commit list: