[dpdk-stable] patch 'doc: fix typo in contributors guide' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Fri Jun 5 20:25:23 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9b5e5ace1a45fe6367332cb564c456b03ca5b151

Thanks.

Kevin.

---
>From 9b5e5ace1a45fe6367332cb564c456b03ca5b151 Mon Sep 17 00:00:00 2001
From: Sarosh Arif <sarosh.arif at emumba.com>
Date: Sat, 21 Mar 2020 23:06:54 +0500
Subject: [PATCH] doc: fix typo in contributors guide

[ upstream commit e37348d7a6c8cb36524910f029e9b1fa855845aa ]

Bugzilla ID: 420
Fixes: 58abf6e77c6b ("doc: add contributors guide")

Signed-off-by: Sarosh Arif <sarosh.arif at emumba.com>
Acked-by: John McNamara <john.mcnamara at intel.com>
---
 doc/guides/contributing/patches.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index 02cd0555a4..4d8ec47619 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -407,5 +407,5 @@ files, in order of preference::
    /etc/dpdk/devel.config.
 
-Once the environment variable the script can be run as follows::
+Once the environment variable is set, the script can be run as follows::
 
    devtools/checkpatches.sh ~/patch/
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.483475896 +0100
+++ 0086-doc-fix-typo-in-contributors-guide.patch	2020-06-05 19:20:50.991036701 +0100
@@ -1 +1 @@
-From e37348d7a6c8cb36524910f029e9b1fa855845aa Mon Sep 17 00:00:00 2001
+From 9b5e5ace1a45fe6367332cb564c456b03ca5b151 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e37348d7a6c8cb36524910f029e9b1fa855845aa ]
+
@@ -8 +9,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
-index e6a934846e..5e6faa0c63 100644
+index 02cd0555a4..4d8ec47619 100644
@@ -20 +21 @@
-@@ -424,5 +424,5 @@ are loaded from the following files, in order of preference::
+@@ -407,5 +407,5 @@ files, in order of preference::



More information about the stable mailing list