patch 'doc: fix display of commands in cpfl guide' has been queued to stable release 23.11.6
Shani Peretz
shperetz at nvidia.com
Sun Dec 21 15:56:50 CET 2025
Hi,
FYI, your patch has been queued to stable release 23.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/26/25. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/shanipr/dpdk-stable
This queued commit can be viewed at:
https://github.com/shanipr/dpdk-stable/commit/8d2f78a3ae3e54d60ca8cf8413172dea221cd055
Thanks.
Shani
---
>From 8d2f78a3ae3e54d60ca8cf8413172dea221cd055 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 3 Oct 2025 15:58:48 +0100
Subject: [PATCH] doc: fix display of commands in cpfl guide
[ upstream commit 484451b27293f2745baf6793e5c4a3c3224f50f5 ]
The literal text of the commands to use were not displayed properly
because of a double ":" at the end of the preceding text, meaning that
the ".. code-block" marker got recognised as the literal text to
include. Change the double colon to single, and also indent the line
continuation in the multi-line flow-create command.
Fixes: 03f976012304 ("net/cpfl: adapt FXP to flow engine")
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Praveen Shetty <praveen.shetty at intel.com>
---
doc/guides/nics/cpfl.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/guides/nics/cpfl.rst b/doc/guides/nics/cpfl.rst
index 9b7a99c894..cc9f4320f8 100644
--- a/doc/guides/nics/cpfl.rst
+++ b/doc/guides/nics/cpfl.rst
@@ -206,14 +206,14 @@ low level hardware resources.
dpdk-testpmd -c 0x3 -n 4 -a 0000:af:00.6,vport=[0-1],flow_parser="refpkg.json" -- -i
#. Create one flow to forward ETH-IPV4-TCP from I/O port to a local(CPF's) vport. Flow should be created on
- vport X. Group M should match fxp module. Action port_representor Y means forward packet to local vport Y::
+ vport X. Group M should match fxp module. Action port_representor Y means forward packet to local vport Y:
.. code-block:: console
flow create X ingress group M pattern eth dst is 00:01:00:00:03:14 / ipv4 src is 192.168.0.1 \
- dst is 192.168.0.2 / tcp / end actions port_representor port_id Y / end
+ dst is 192.168.0.2 / tcp / end actions port_representor port_id Y / end
-#. Send a matched packet, and it should be displayed on PMD::
+#. Send a matched packet, and it should be displayed on PMD:
.. code-block:: console
--
2.43.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-12-21 16:54:20.345169804 +0200
+++ 0062-doc-fix-display-of-commands-in-cpfl-guide.patch 2025-12-21 16:54:17.172097000 +0200
@@ -1 +1 @@
-From 484451b27293f2745baf6793e5c4a3c3224f50f5 Mon Sep 17 00:00:00 2001
+From 8d2f78a3ae3e54d60ca8cf8413172dea221cd055 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 484451b27293f2745baf6793e5c4a3c3224f50f5 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 54a3015aa0..bc42c524ea 100644
+index 9b7a99c894..cc9f4320f8 100644
@@ -25,2 +26,2 @@
-@@ -218,14 +218,14 @@ low level hardware resources.
- dpdk-testpmd -l 0,1 -a 0000:af:00.6,vport=[0-1],flow_parser="refpkg.json" -- -i
+@@ -206,14 +206,14 @@ low level hardware resources.
+ dpdk-testpmd -c 0x3 -n 4 -a 0000:af:00.6,vport=[0-1],flow_parser="refpkg.json" -- -i
More information about the stable
mailing list