From 03542224d1f66f850770bf0981da07a5633bb9d4 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Nov 16 2024 07:40:06 +0000
Subject: Import openvswitch3.1-3.1.0-140 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index 831b072..8375a85 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -649,12 +649,16 @@ index e605187b81..859c746b01 100644
  	@if cmp -s $(@F).tmp $@; then \
  	  touch $@; \
 diff --git a/NEWS b/NEWS
-index 37a01dea50..a094c3c7af 100644
+index 37a01dea50..7dbed73a6d 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,36 @@
-+v3.1.6 - xx xxx xxxx
+@@ -1,3 +1,40 @@
++v3.1.7 - xx xxx xxxx
 +--------------------
++
++v3.1.6 - 15 Nov 2024
++--------------------
++   - Bug fixes
 +   - DPDK:
 +     * OVS validated with DPDK 22.11.6.
 +
@@ -1695,7 +1699,7 @@ index ee5553f456..3e937910be 100755
          sys.exit(1)
      for line in s.splitlines():
 diff --git a/configure.ac b/configure.ac
-index 9bf896c013..b05bdbe17d 100644
+index 9bf896c013..69a49c30d4 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -1703,7 +1707,7 @@ index 9bf896c013..b05bdbe17d 100644
  
  AC_PREREQ(2.63)
 -AC_INIT(openvswitch, 3.1.0, bugs@openvswitch.org)
-+AC_INIT(openvswitch, 3.1.6, bugs@openvswitch.org)
++AC_INIT(openvswitch, 3.1.7, bugs@openvswitch.org)
  AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
@@ -1740,15 +1744,21 @@ index a354f007fd..185a06b03e 100644
 -
  CLEANFILES += $(srcdir)/datapath-windows/include/OvsDpInterface.h
 diff --git a/debian/changelog b/debian/changelog
-index a5ad222c4c..56ca7fd485 100644
+index a5ad222c4c..3c471bc8dd 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,39 @@
+@@ -1,3 +1,45 @@
++openvswitch (3.1.7-1) unstable; urgency=low
++   [ Open vSwitch team ]
++   * New upstream version
++
++ -- Open vSwitch team <dev@openvswitch.org>  Fri, 15 Nov 2024 14:33:45 +0100
++
 +openvswitch (3.1.6-1) unstable; urgency=low
 +   [ Open vSwitch team ]
 +   * New upstream version
 +
-+ -- Open vSwitch team <dev@openvswitch.org>  Fri, 07 Jun 2024 15:58:06 +0200
++ -- Open vSwitch team <dev@openvswitch.org>  Fri, 15 Nov 2024 14:33:45 +0100
 +
 +openvswitch (3.1.5-1) unstable; urgency=low
 +   [ Open vSwitch team ]
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index 0a5c8ef..6429abd 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 139%{?dist}
+Release: 140%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -756,6 +756,13 @@ exit 0
 %endif
 
 %changelog
+* Sat Nov 16 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-140
+- Merging upstream branch-3.1 [RH git: 29ea9e0b72]
+    Commit list:
+    0fd8f07fa2 Prepare for 3.1.7.
+    a795725afb Set release date for 3.1.6.
+
+
 * Fri Nov 15 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-139
 - Merging upstream branch-3.1 [RH git: 4c67768003]
     Commit list: