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

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed May 27 11:24:21 CEST 2020


Hi,

FYI, your patch has been queued to stable release 19.11.3

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/29/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.

Thanks.

Luca Boccassi

---
>From 130830b165956abce43c68caf42c745e40219ba6 Mon Sep 17 00:00:00 2001
From: Muhammad Bilal <m.bilal at emumba.com>
Date: Thu, 26 Mar 2020 10:46:54 +0500
Subject: [PATCH] doc: fix typo in contributors guide

[ upstream commit ba8af67fcd7aea9f0d4956bc58b15c71d3319744 ]

Bugzilla ID: 422
Fixes: 9e0e4a00df77 ("doc: suggest to keep doc and code in same patch")

Signed-off-by: Muhammad Bilal <m.bilal at emumba.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 acdef7fa93..e5c565b984 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -182,7 +182,7 @@ A good way of thinking about whether a patch should be split is to consider whet
 applied without dependencies as a backport.
 
 It is better to keep the related documentation changes in the same patch
-file as the code, rather than one big documentation patch at then end of a
+file as the code, rather than one big documentation patch at the end of a
 patchset. This makes it easier for future maintenance and development of the
 code.
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-27 10:23:32.251503903 +0100
+++ 0018-doc-fix-typo-in-contributors-guide.patch	2020-05-27 10:23:31.655933983 +0100
@@ -1,11 +1,12 @@
-From ba8af67fcd7aea9f0d4956bc58b15c71d3319744 Mon Sep 17 00:00:00 2001
+From 130830b165956abce43c68caf42c745e40219ba6 Mon Sep 17 00:00:00 2001
 From: Muhammad Bilal <m.bilal at emumba.com>
 Date: Thu, 26 Mar 2020 10:46:54 +0500
 Subject: [PATCH] doc: fix typo in contributors guide
 
+[ upstream commit ba8af67fcd7aea9f0d4956bc58b15c71d3319744 ]
+
 Bugzilla ID: 422
 Fixes: 9e0e4a00df77 ("doc: suggest to keep doc and code in same patch")
-Cc: stable at dpdk.org
 
 Signed-off-by: Muhammad Bilal <m.bilal at emumba.com>
 ---
@@ -13,7 +14,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
-index 5e6faa0c63..01e0a2f6ba 100644
+index acdef7fa93..e5c565b984 100644
 --- a/doc/guides/contributing/patches.rst
 +++ b/doc/guides/contributing/patches.rst
 @@ -182,7 +182,7 @@ A good way of thinking about whether a patch should be split is to consider whet


More information about the stable mailing list