From 87817264ff0642c4e9d95623b08d64d69af49bd1 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 02 2022 18:20:54 +0000
Subject: Import openvswitch2.16-2.16.0-46 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch
index acde610..f4fd9e9 100644
--- a/SOURCES/openvswitch-2.16.0.patch
+++ b/SOURCES/openvswitch-2.16.0.patch
@@ -146,6 +146,19 @@ index 559a51ba3f..ecaf9ffd78 100644
  v2.16.0 - 16 Aug 2021
  ---------------------
     - Removed support for 1024-bit Diffie-Hellman key exchange, which is now
+diff --git a/acinclude.m4 b/acinclude.m4
+index dba365ea1a..1a43d7feaa 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -77,7 +77,7 @@ dnl Checks if compiler and binutils supports AVX512.
+ AC_DEFUN([OVS_CHECK_AVX512], [
+   OVS_CHECK_BINUTILS_AVX512
+   OVS_CHECK_CC_OPTION(
+-    [-mavx512f], [ovs_have_cc_mavx512f=yes], [ovs_have_cc_mavx512f=no])
++    [-mavx512f -mavx512vpopcntdq], [ovs_have_cc_mavx512f=yes], [ovs_have_cc_mavx512f=no])
+   AM_CONDITIONAL([HAVE_AVX512F], [test $ovs_have_cc_mavx512f = yes])
+   if test "$ovs_have_cc_mavx512f" = yes; then
+     AC_DEFINE([HAVE_AVX512F], [1],
 diff --git a/configure.ac b/configure.ac
 index 16b32be965..92817b62e1 100644
 --- a/configure.ac
diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec
index 071e455..22c06cf 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: 45%{?dist}
+Release: 46%{?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
+* Wed Feb 02 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-46
+- Merging upstream branch-2.16 [RH git: 513117cbb0]
+    Commit list:
+    16575362dc acinclude: Detect avx512 vpopcntdq compiler support.
+
+
 * Tue Feb 01 2022 Ilya Maximets <i.maximets@redhat.com> - 2.16.0-45
 - ovsdb: transaction: Keep one entry in the transaction history. [RH git: 7665f42d12] (#2044621)
     commit 6e13565dd32fb2cf5517f51ca06956e2052c4bba