From 9fa4e0ed54cd6ac174ad0c5de6ab337b863de953 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 15 2022 19:13:55 +0000
Subject: Import openvswitch2.15-2.15.0-106 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index 4be84f5..4ecd366 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -649,13 +649,17 @@ index 0000000000..cdded4f906
 +.. _bcc : https://github.com/iovisor/bcc
 +.. _Trace Compass : https://www.eclipse.org/tracecompass/
 diff --git a/NEWS b/NEWS
-index bc901efdb1..479b379f44 100644
+index bc901efdb1..f46c851daa 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,52 @@
-+v2.15.5 - xx xxx xxxx
+@@ -1,3 +1,56 @@
++v2.15.6 - xx xxx xxxx
 +---------------------
 +
++v2.15.5 - 15 Jun 2022
++---------------------
++   - Bug fixes
++
 +v2.15.4 - 08 Apr 2022
 +---------------------
 +   - Bug fixes
@@ -747,7 +751,7 @@ index 435685c93d..cbaee636b4 100644
     AC_ARG_ENABLE(
       [sparse],
 diff --git a/configure.ac b/configure.ac
-index fd82d7d270..63d06b9ae1 100644
+index fd82d7d270..4a4c7f477a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -755,7 +759,7 @@ index fd82d7d270..63d06b9ae1 100644
  
  AC_PREREQ(2.63)
 -AC_INIT(openvswitch, 2.15.0, bugs@openvswitch.org)
-+AC_INIT(openvswitch, 2.15.5, bugs@openvswitch.org)
++AC_INIT(openvswitch, 2.15.6, bugs@openvswitch.org)
  AC_CONFIG_SRCDIR([datapath/datapath.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
@@ -1349,15 +1353,21 @@ index 4cce92f66c..bc18c56b81 100644
  #define nf_conntrack_in rpl_nf_conntrack_in
  #endif /* HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE */
 diff --git a/debian/changelog b/debian/changelog
-index 1f2b7a3668..8c67fbe4b2 100644
+index 1f2b7a3668..8ffbbd3114 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,33 @@
+@@ -1,3 +1,39 @@
++openvswitch (2.15.6-1) unstable; urgency=low
++   [ Open vSwitch team ]
++   * New upstream version
++
++ -- Open vSwitch team <dev@openvswitch.org>  Wed, 15 Jun 2022 12:03:31 +0200
++
 +openvswitch (2.15.5-1) unstable; urgency=low
 +   [ Open vSwitch team ]
 +   * New upstream version
 +
-+ -- Open vSwitch team <dev@openvswitch.org>  Fri, 08 Apr 2022 14:57:41 +0200
++ -- Open vSwitch team <dev@openvswitch.org>  Wed, 15 Jun 2022 12:03:31 +0200
 +
 +openvswitch (2.15.4-1) unstable; urgency=low
 +   [ Open vSwitch team ]
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 65e7a90..f9805a5 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 105%{?dist}
+Release: 106%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +702,13 @@ exit 0
 %endif
 
 %changelog
+* Wed Jun 15 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-106
+- Merging upstream branch-2.15 [RH git: ab1d6faf99]
+    Commit list:
+    4c36bab380 Prepare for 2.15.6.
+    b12608cc2e Set release date for 2.15.5.
+
+
 * Tue Jun 07 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-105
 - Merging upstream branch-2.15 [RH git: c904e84c3e]
     Commit list: