From 5fa679b7bf63340289938a7cf71b59587b2995ac Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Aug 28 2024 00:31:01 +0000
Subject: Import openvswitch2.17-2.17.0-186 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index ba1c4cc..62da682 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -550,13 +550,17 @@ index cb8076433e..70c9c62b13 100644
  	@if cmp -s $(@F).tmp $@; then \
  	  touch $@; \
 diff --git a/NEWS b/NEWS
-index c10e9bfacc..8ba8a8d621 100644
+index c10e9bfacc..4370d07278 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,97 @@
-+v2.17.11 - xx xxx xxxx
+@@ -1,3 +1,101 @@
++v2.17.12 - xx xxx xxxx
 +----------------------
 +
++v2.17.11 - 27 Aug 2024
++----------------------
++   - Bug fixes
++
 +v2.17.10 - 07 Jun 2024
 +----------------------
 +   - Bug fixes
@@ -2096,7 +2100,7 @@ index ee5553f456..3e937910be 100755
          sys.exit(1)
      for line in s.splitlines():
 diff --git a/configure.ac b/configure.ac
-index 4e9bcce272..187431e518 100644
+index 4e9bcce272..bec9db9ec1 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -2104,7 +2108,7 @@ index 4e9bcce272..187431e518 100644
  
  AC_PREREQ(2.63)
 -AC_INIT(openvswitch, 2.17.0, bugs@openvswitch.org)
-+AC_INIT(openvswitch, 2.17.11, bugs@openvswitch.org)
++AC_INIT(openvswitch, 2.17.12, bugs@openvswitch.org)
  AC_CONFIG_SRCDIR([datapath/datapath.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
@@ -2380,15 +2384,21 @@ index cc0840704a..2a206305ec 100644
          completionList->dropNbl = NULL;
          completionList->dropNblNext = &completionList->dropNbl;
 diff --git a/debian/changelog b/debian/changelog
-index 3e0d3a66e3..dee876165b 100644
+index 3e0d3a66e3..260806a468 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,69 @@
+@@ -1,3 +1,75 @@
++openvswitch (2.17.12-1) unstable; urgency=low
++   [ Open vSwitch team ]
++   * New upstream version
++
++ -- Open vSwitch team <dev@openvswitch.org>  Tue, 27 Aug 2024 14:33:20 +0200
++
 +openvswitch (2.17.11-1) unstable; urgency=low
 +   [ Open vSwitch team ]
 +   * New upstream version
 +
-+ -- Open vSwitch team <dev@openvswitch.org>  Fri, 07 Jun 2024 15:57:48 +0200
++ -- Open vSwitch team <dev@openvswitch.org>  Tue, 27 Aug 2024 14:33:20 +0200
 +
 +openvswitch (2.17.10-1) unstable; urgency=low
 +   [ Open vSwitch team ]
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index 3c1c2a8..0cbaa0d 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 185%{?dist}
+Release: 186%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -749,6 +749,13 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 27 2024 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-186
+- Merging upstream branch-2.17 [RH git: ce1913f74c]
+    Commit list:
+    fecbba4bc0 Prepare for 2.17.12.
+    394ba58edf Set release date for 2.17.11.
+
+
 * Wed Aug 14 2024 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-185
 - Merging upstream branch-2.17 [RH git: c20775fdb1]
     Commit list: