From dae1d1caecf95ca9e0dd73d689671230812c84fc Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 27 2023 17:11:37 +0000
Subject: Import openvswitch2.17-2.17.0-93 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index 56f7ad8..eadc207 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -336,13 +336,17 @@ index 27be4aa412..1dc406170f 100644
 +.. |emeritus-status|  replace:: `Emeritus Status for OVS Committers
 +   <Documentation/internals/committer-emeritus-status.rst>`__
 diff --git a/NEWS b/NEWS
-index c10e9bfacc..095b0574f4 100644
+index c10e9bfacc..673f227202 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,75 @@
-+v2.17.7 - xx xxx xxxx
+@@ -1,3 +1,79 @@
++v2.17.8 - xx xxx xxxx
 +---------------------
 +
++v2.17.7 - 27 Jun 2023
++---------------------
++   - Bug fixes
++
 +v2.17.6 - 06 Apr 2023
 +---------------------
 +   - Bug fixes
@@ -617,7 +621,7 @@ index 1884c99e1f..aca1dbca91 100755
 +dhparam_to_c lib/dh4096.pem
 +echo "#endif"
 diff --git a/configure.ac b/configure.ac
-index 4e9bcce272..4b8c162067 100644
+index 4e9bcce272..134106f54a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -625,7 +629,7 @@ index 4e9bcce272..4b8c162067 100644
  
  AC_PREREQ(2.63)
 -AC_INIT(openvswitch, 2.17.0, bugs@openvswitch.org)
-+AC_INIT(openvswitch, 2.17.7, bugs@openvswitch.org)
++AC_INIT(openvswitch, 2.17.8, bugs@openvswitch.org)
  AC_CONFIG_SRCDIR([datapath/datapath.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
@@ -877,15 +881,21 @@ index cc0840704a..2a206305ec 100644
          completionList->dropNbl = NULL;
          completionList->dropNblNext = &completionList->dropNbl;
 diff --git a/debian/changelog b/debian/changelog
-index 3e0d3a66e3..0c1940c6e7 100644
+index 3e0d3a66e3..e5de002d34 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,45 @@
+@@ -1,3 +1,51 @@
++openvswitch (2.17.8-1) unstable; urgency=low
++   [ Open vSwitch team ]
++   * New upstream version
++
++ -- Open vSwitch team <dev@openvswitch.org>  Tue, 27 Jun 2023 14:08:41 +0200
++
 +openvswitch (2.17.7-1) unstable; urgency=low
 +   [ Open vSwitch team ]
 +   * New upstream version
 +
-+ -- Open vSwitch team <dev@openvswitch.org>  Thu, 06 Apr 2023 15:09:54 +0200
++ -- Open vSwitch team <dev@openvswitch.org>  Tue, 27 Jun 2023 14:08:41 +0200
 +
 +openvswitch (2.17.6-1) unstable; urgency=low
 +   [ Open vSwitch team ]
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index 5729040..90b84e2 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 92%{?dist}
+Release: 93%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -751,6 +751,13 @@ exit 0
 %endif
 
 %changelog
+* Tue Jun 27 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-93
+- Merging upstream branch-2.17 [RH git: bfc17b1bd2]
+    Commit list:
+    e206df08d2 Prepare for 2.17.8.
+    f15de6508c Set release date for 2.17.7.
+
+
 * Fri Jun 16 2023 Timothy Redaelli <tredaelli@redhat.com> - 2.17.0-92
 - redhat: Use sysusers instead of useradd/groupadd directly [RH git: aeeb5c020a] (#2193168)
     Reported-at: https://bugzilla.redhat.com/2193168