From ab16ad3ec77ed2b83c5317f4fdbd980a297afc8a Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Aug 17 2023 15:00:34 +0000
Subject: Import openvswitch3.1-3.1.0-46 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index 68c0fac..10a2d8b 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -2447,6 +2447,19 @@ index 2d382f1e8..ac5d2c3d0 100644
          last_updated = now;
          cpu_cores = count_cpu_cores__();
      }
+diff --git a/lib/ovs.tmac b/lib/ovs.tmac
+index 5f8f20afa..97b6fa3df 100644
+--- a/lib/ovs.tmac
++++ b/lib/ovs.tmac
+@@ -175,7 +175,7 @@
+ .  nr mE \\n(.f
+ .  nf
+ .  nh
+-.  ft CW
++.  ft CR
+ ..
+ .
+ .
 diff --git a/lib/smap.c b/lib/smap.c
 index c1633e2a1..47fb34502 100644
 --- a/lib/smap.c
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index 1109e81..3d92b0c 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: 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
@@ -754,6 +754,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 17 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-46
+- Merging upstream branch-3.1 [RH git: 0eb500c766]
+    Commit list:
+    4c027ebd3b ovs.tmac: Fix troff warning in versions above groff-1.23.
+
+
 * Tue Aug 15 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-45
 - Merging upstream branch-3.1 [RH git: f035df35aa]
     Commit list: