From 8129b5131c6c494f8ad3c6599438b39c2da60ac7 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: May 30 2024 22:58:12 +0000
Subject: Import openvswitch3.1-3.1.0-121 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index e49a00f..ae6d1ad 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -216,7 +216,7 @@ index 952d964315..8db385f002 100644
      memory: 4G
  
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
-index 82675b9734..22dc81252d 100644
+index 82675b9734..6659c10256 100644
 --- a/.github/workflows/build-and-test.yml
 +++ b/.github/workflows/build-and-test.yml
 @@ -2,13 +2,84 @@ name: Build and Test
@@ -232,7 +232,7 @@ index 82675b9734..22dc81252d 100644
 +      dependencies: gcc libnuma-dev ninja-build
 +      CC: gcc
 +      DPDK_GIT: https://dpdk.org/git/dpdk-stable
-+      DPDK_VER: 22.11.4
++      DPDK_VER: 22.11.5
 +    name: dpdk gcc
 +    outputs:
 +      dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }}
@@ -470,7 +470,7 @@ index 2df76c56f1..b29b1f4051 100644
  DK Moon
  Ding Zhi                        zhi.ding@6wind.com
 diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
-index 9e1b422620..a393f78a89 100644
+index 9e1b422620..a2625062d1 100644
 --- a/Documentation/faq/releases.rst
 +++ b/Documentation/faq/releases.rst
 @@ -214,9 +214,9 @@ Q: What DPDK version does each Open vSwitch release work with?
@@ -480,14 +480,14 @@ index 9e1b422620..a393f78a89 100644
 -    2.17.x       21.11.2
 -    3.0.x        21.11.2
 -    3.1.x        22.11.1
-+    2.17.x       21.11.6
-+    3.0.x        21.11.6
-+    3.1.x        22.11.4
++    2.17.x       21.11.7
++    3.0.x        21.11.7
++    3.1.x        22.11.5
      ============ ========
  
  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..27df48493e 100644
+index 63a0ebb23b..a9921ae426 100644
 --- a/Documentation/intro/install/dpdk.rst
 +++ b/Documentation/intro/install/dpdk.rst
 @@ -42,7 +42,7 @@ Build requirements
@@ -495,7 +495,7 @@ index 63a0ebb23b..27df48493e 100644
  vSwitch with DPDK will require the following:
  
 -- DPDK 22.11.1
-+- DPDK 22.11.4
++- DPDK 22.11.5
  
  - A `DPDK supported NIC`_
  
@@ -506,9 +506,9 @@ index 63a0ebb23b..27df48493e 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.4.tar.xz
-+       $ tar xf dpdk-22.11.4.tar.xz
-+       $ export DPDK_DIR=/usr/src/dpdk-stable-22.11.4
++       $ 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
         $ cd $DPDK_DIR
  
  #. Configure and install DPDK using Meson
@@ -612,12 +612,14 @@ index e605187b81..f2e0650b88 100644
  	@if cmp -s $(@F).tmp $@; then \
  	  touch $@; \
 diff --git a/NEWS b/NEWS
-index 37a01dea50..aaddb77e8e 100644
+index 37a01dea50..44a3e6247b 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,28 @@
+@@ -1,3 +1,30 @@
 +v3.1.5 - xx xxx xxxx
 +--------------------
++   - DPDK:
++     * OVS validated with DPDK 22.11.5.
 +
 +v3.1.4 - 08 Feb 2024
 +--------------------
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index 928549e..1bf476f 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 120%{?dist}
+Release: 121%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -757,6 +757,12 @@ exit 0
 %endif
 
 %changelog
+* Thu May 30 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-121
+- Merging upstream branch-3.1 [RH git: 456d22059a]
+    Commit list:
+    a5f41f0554 dpdk: Use DPDK 22.11.5 release for OVS 3.1.
+
+
 * Tue May 28 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-120
 - Merging upstream branch-3.1 [RH git: 03eb87618b]
     Commit list: