patch 'doc: fix default mempool option in guides' has been queued to stable release 19.11.11

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Tue Nov 30 17:35:01 CET 2021


Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/e856790c5fcb542781b24114176c76933a080b42

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From e856790c5fcb542781b24114176c76933a080b42 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 15 Oct 2021 10:39:41 +0200
Subject: [PATCH] doc: fix default mempool option in guides

[ upstream commit 65c2bbf41f2258fea8e1639a86598f48d8251756 ]

This option should be prefixed with -- for consistency with others.

Fixes: a103a97e7191 ("eal: allow user to override default mempool driver")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Olivier Matz <olivier.matz at 6wind.com>
---
 doc/guides/freebsd_gsg/build_sample_apps.rst | 2 +-
 doc/guides/linux_gsg/build_sample_apps.rst   | 2 +-
 doc/guides/linux_gsg/eal_args.include.rst    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/freebsd_gsg/build_sample_apps.rst b/doc/guides/freebsd_gsg/build_sample_apps.rst
index 0c1b9cb79f..bd3ec8a923 100644
--- a/doc/guides/freebsd_gsg/build_sample_apps.rst
+++ b/doc/guides/freebsd_gsg/build_sample_apps.rst
@@ -139,7 +139,7 @@ Other options, specific to Linux and are not supported under FreeBSD are as foll
 *   ``--huge-dir``:
     The directory where hugetlbfs is mounted.
 
-*   ``mbuf-pool-ops-name``:
+*   ``--mbuf-pool-ops-name``:
     Pool ops name for mbuf to use.
 
 *   ``--file-prefix``:
diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst
index 2c2f5faec5..8d2740b5f3 100644
--- a/doc/guides/linux_gsg/build_sample_apps.rst
+++ b/doc/guides/linux_gsg/build_sample_apps.rst
@@ -136,7 +136,7 @@ The EAL options are as follows:
 * ``--huge-dir``:
   The directory where hugetlbfs is mounted.
 
-* ``mbuf-pool-ops-name``:
+* ``--mbuf-pool-ops-name``:
   Pool ops name for mbuf to use.
 
 * ``--file-prefix``:
diff --git a/doc/guides/linux_gsg/eal_args.include.rst b/doc/guides/linux_gsg/eal_args.include.rst
index 7b2f6b1d43..56c19c9b00 100644
--- a/doc/guides/linux_gsg/eal_args.include.rst
+++ b/doc/guides/linux_gsg/eal_args.include.rst
@@ -147,6 +147,6 @@ Other options
 
     Display the version information on startup.
 
-*   ``mbuf-pool-ops-name``:
+*   ``--mbuf-pool-ops-name``:
 
     Pool ops name for mbuf to use.
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:11.509701229 +0100
+++ 0097-doc-fix-default-mempool-option-in-guides.patch	2021-11-30 16:50:05.894874293 +0100
@@ -1 +1 @@
-From 65c2bbf41f2258fea8e1639a86598f48d8251756 Mon Sep 17 00:00:00 2001
+From e856790c5fcb542781b24114176c76933a080b42 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 65c2bbf41f2258fea8e1639a86598f48d8251756 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 4fba671e4f..c87e982759 100644
+index 0c1b9cb79f..bd3ec8a923 100644
@@ -23 +24 @@
-@@ -88,7 +88,7 @@ Other options, specific to Linux and are not supported under FreeBSD are as foll
+@@ -139,7 +139,7 @@ Other options, specific to Linux and are not supported under FreeBSD are as foll
@@ -33 +34 @@
-index 709b301427..efd2dd23f1 100644
+index 2c2f5faec5..8d2740b5f3 100644
@@ -36 +37 @@
-@@ -82,7 +82,7 @@ The EAL options are as follows:
+@@ -136,7 +136,7 @@ The EAL options are as follows:
@@ -46 +47 @@
-index 96baa4a9b0..3549a0cf56 100644
+index 7b2f6b1d43..56c19c9b00 100644
@@ -49 +50 @@
-@@ -199,7 +199,7 @@ Other options
+@@ -147,6 +147,6 @@ Other options
@@ -57 +57,0 @@
- 


More information about the stable mailing list