From 638be50fab015a8b4b49e4d094511463eb63f4f2 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Apr 18 2022 23:59:38 +0000
Subject: Import openvswitch2.16-2.16.0-69 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch
index 9d8d1c0..0886647 100644
--- a/SOURCES/openvswitch-2.16.0.patch
+++ b/SOURCES/openvswitch-2.16.0.patch
@@ -43,12 +43,17 @@ index c55125cf78..c0b7473eda 100755
  
  if [ "$M32" ]; then
 diff --git a/.cirrus.yml b/.cirrus.yml
-index 358f2ba256..a7ae793bc4 100644
+index 358f2ba256..a4d2a5bbcd 100644
 --- a/.cirrus.yml
 +++ b/.cirrus.yml
-@@ -5,11 +5,11 @@ freebsd_build_task:
-       image_family: freebsd-12-2-snap
-       image_family: freebsd-11-4-snap
+@@ -2,14 +2,14 @@ freebsd_build_task:
+ 
+   freebsd_instance:
+     matrix:
+-      image_family: freebsd-12-2-snap
+-      image_family: freebsd-11-4-snap
++      image_family: freebsd-12-3-snap
++      image_family: freebsd-13-0-snap
      cpu: 4
 -    memory: 8G
 +    memory: 4G
diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec
index 42788d8..26f09f6 100644
--- a/SPECS/openvswitch2.16.spec
+++ b/SPECS/openvswitch2.16.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.16.0
-Release: 68%{?dist}
+Release: 69%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -699,6 +699,12 @@ exit 0
 %endif
 
 %changelog
+* Mon Apr 18 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-69
+- Merging upstream branch-2.16 [RH git: c9969bac2f]
+    Commit list:
+    2afa9d2285 cirrus: Update FreeBSD versions.
+
+
 * Fri Apr 08 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-68
 - Merging upstream branch-2.16 [RH git: 2ee98fa0ff]
     Commit list: