patch 'doc: fix typo in coding style' has been queued to stable release 19.11.11

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Tue Nov 30 17:36:05 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/c06b4e46c90fa45033d0433e0a9943358d2bc337

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From c06b4e46c90fa45033d0433e0a9943358d2bc337 Mon Sep 17 00:00:00 2001
From: Dariusz Sosnowski <dsosnowski at nvidia.com>
Date: Fri, 29 Oct 2021 16:19:02 +0300
Subject: [PATCH] doc: fix typo in coding style

[ upstream commit 6965091e0bf15134328ed0038b03a7700dc17245 ]

This patch fixes a typo in DPDK Coding Style, in Return Values section,
i.e. replaces "indicated may" with "indicated by".

Fixes: 36032e46be40 ("doc: add coding style")

Signed-off-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 doc/guides/contributing/coding_style.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst
index 841ef6d5c8..95e2d4c22c 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -591,7 +591,7 @@ Return Value
 ~~~~~~~~~~~~
 
 * Functions which create objects, or allocate memory, should return pointer types, and NULL on error.
-  The error type should be indicated may setting the variable ``rte_errno`` appropriately.
+  The error type should be indicated by setting the variable ``rte_errno`` appropriately.
 * Functions which work on bursts of packets, such as RX-like or TX-like functions, should return the number of packets handled.
 * Other functions returning int should generally behave like system calls:
   returning 0 on success and -1 on error, setting ``rte_errno`` to indicate the specific type of error.
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:15.464215455 +0100
+++ 0161-doc-fix-typo-in-coding-style.patch	2021-11-30 16:50:06.230876758 +0100
@@ -1 +1 @@
-From 6965091e0bf15134328ed0038b03a7700dc17245 Mon Sep 17 00:00:00 2001
+From c06b4e46c90fa45033d0433e0a9943358d2bc337 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6965091e0bf15134328ed0038b03a7700dc17245 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 1ce5d00e36..0ec37c019b 100644
+index 841ef6d5c8..95e2d4c22c 100644
@@ -22 +23 @@
-@@ -619,7 +619,7 @@ Return Value
+@@ -591,7 +591,7 @@ Return Value


More information about the stable mailing list