From 445f07ccbec19b698f2346021b980be705e7cf41 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jul 19 2024 15:24:08 +0000
Subject: Import openvswitch2.17-2.17.0-182 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index 093a581..ee9111f 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -445,6 +445,28 @@ index 937f4c40e5..90c8691e32 100644
  
  - Configure the VF MAC address::
  
+diff --git a/Documentation/topics/dpdk/vhost-user.rst b/Documentation/topics/dpdk/vhost-user.rst
+index 97e66a99ed..45c95532f1 100644
+--- a/Documentation/topics/dpdk/vhost-user.rst
++++ b/Documentation/topics/dpdk/vhost-user.rst
+@@ -312,7 +312,7 @@ predictable migration time. Mostly used as a second phase after the normal
+ 
+ More information can be found in QEMU `docs`_.
+ 
+-.. _`docs`: https://git.qemu.org/?p=qemu.git;a=blob;f=docs/devel/migration.rst
++.. _`docs`: https://www.qemu.org/docs/master/devel/migration/postcopy.html
+ 
+ Post-copy support may be enabled via a global config value
+ ``vhost-postcopy-support``. Setting this to ``true`` enables Post-copy support
+@@ -485,7 +485,7 @@ Sample XML
+       </devices>
+     </domain>
+ 
+-.. _QEMU documentation: http://git.qemu-project.org/?p=qemu.git;a=blob;f=docs/specs/vhost-user.txt;h=7890d7169;hb=HEAD
++.. _QEMU documentation: https://www.qemu.org/docs/master/interop/vhost-user.html
+ 
+ Jumbo Frames
+ ------------
 diff --git a/MAINTAINERS.rst b/MAINTAINERS.rst
 index 27be4aa412..1dc406170f 100644
 --- a/MAINTAINERS.rst
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index 2c9d98f..396d356 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 181%{?dist}
+Release: 182%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -749,6 +749,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Jul 19 2024 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-182
+- Merging upstream branch-2.17 [RH git: 3c9d9f6c10]
+    Commit list:
+    a241f77650 Documentation: Update QEMU documentation URLs.
+
+
 * Thu Jul 18 2024 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-181
 - Merging upstream branch-2.17 [RH git: 9446036a68]
     Commit list: