From a28a680cc6e1d7f16bb7402e6ba1b88db3122adf Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 08 2024 01:37:17 +0000
Subject: Import openvswitch3.1-3.1.0-126 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index 8d1cf2b..e1ea504 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -612,12 +612,16 @@ index e605187b81..f2e0650b88 100644
  	@if cmp -s $(@F).tmp $@; then \
  	  touch $@; \
 diff --git a/NEWS b/NEWS
-index 37a01dea50..44a3e6247b 100644
+index 37a01dea50..cf0700ab3a 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,30 @@
-+v3.1.5 - xx xxx xxxx
+@@ -1,3 +1,34 @@
++v3.1.6 - xx xxx xxxx
 +--------------------
++
++v3.1.5 - 07 Jun 2024
++--------------------
++   - Bug fixes
 +   - DPDK:
 +     * OVS validated with DPDK 22.11.5.
 +
@@ -1628,7 +1632,7 @@ index ee5553f456..3e937910be 100755
          sys.exit(1)
      for line in s.splitlines():
 diff --git a/configure.ac b/configure.ac
-index 9bf896c013..c30e273c57 100644
+index 9bf896c013..d647b547c5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -1636,7 +1640,7 @@ index 9bf896c013..c30e273c57 100644
  
  AC_PREREQ(2.63)
 -AC_INIT(openvswitch, 3.1.0, bugs@openvswitch.org)
-+AC_INIT(openvswitch, 3.1.5, bugs@openvswitch.org)
++AC_INIT(openvswitch, 3.1.6, bugs@openvswitch.org)
  AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
@@ -1665,15 +1669,21 @@ index a354f007fd..185a06b03e 100644
 -
  CLEANFILES += $(srcdir)/datapath-windows/include/OvsDpInterface.h
 diff --git a/debian/changelog b/debian/changelog
-index a5ad222c4c..232c3d2660 100644
+index a5ad222c4c..56ca7fd485 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,33 @@
+@@ -1,3 +1,39 @@
++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
++
 +openvswitch (3.1.5-1) unstable; urgency=low
 +   [ Open vSwitch team ]
 +   * New upstream version
 +
-+ -- Open vSwitch team <dev@openvswitch.org>  Thu, 08 Feb 2024 17:55:19 +0100
++ -- Open vSwitch team <dev@openvswitch.org>  Fri, 07 Jun 2024 15:58:06 +0200
 +
 +openvswitch (3.1.4-1) unstable; urgency=low
 +   [ Open vSwitch team ]
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index bfc8409..7df71ab 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: 125%{?dist}
+Release: 126%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -757,6 +757,13 @@ exit 0
 %endif
 
 %changelog
+* Fri Jun 07 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-126
+- Merging upstream branch-3.1 [RH git: 3c1cb5564d]
+    Commit list:
+    9235944def Prepare for 3.1.6.
+    44695d40ac Set release date for 3.1.5.
+
+
 * Fri Jun 07 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-125
 - Merging upstream branch-3.1 [RH git: 8b69b18632]
     Commit list: