[dpdk-stable] patch 'doc: fix two typos in contributing guide' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Thu Apr 25 17:40:30 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/01/19. 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 can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 490b1e4cd5456d9498b1a60097ebff0def6589dc Mon Sep 17 00:00:00 2001
From: Rami Rosen <ramirose at gmail.com>
Date: Fri, 15 Mar 2019 11:19:00 +0200
Subject: [PATCH] doc: fix two typos in contributing guide

[ upstream commit eeafaf40c9b05f410991fe8302f2b64ce37af510 ]

This patch fixes two typos in the coding style part of
DPDK contributing guide:

- The header entry should have .h file instead of .c file.
- The will->This will

Fixes: 44a6dface13b ("doc: describe how to add new components")

Signed-off-by: Rami Rosen <ramirose at gmail.com>
Acked-by: Marko Kovacevic <marko.kovacevic at intel.com>
---
 doc/guides/contributing/coding_style.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst
index d96698a73..656563dde 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -826,8 +826,8 @@ format.
 
 	sources = files('file1.c', ...)
-	headers = files('file1.c', ...)
+	headers = files('file1.h', ...)
 
 
-The will build based on a number of conventions and assumptions within the DPDK
+This will build based on a number of conventions and assumptions within the DPDK
 itself, for example, that the library name is the same as the directory name in
 which the files are stored.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.117484341 +0100
+++ 0055-doc-fix-two-typos-in-contributing-guide.patch	2019-04-25 16:37:46.771294354 +0100
@@ -1 +1 @@
-From eeafaf40c9b05f410991fe8302f2b64ce37af510 Mon Sep 17 00:00:00 2001
+From 490b1e4cd5456d9498b1a60097ebff0def6589dc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit eeafaf40c9b05f410991fe8302f2b64ce37af510 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list