[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:24 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/a28f45c97ec412e02588cc5efd909cdde58f4018

Thanks.

Kevin.

---
>From a28f45c97ec412e02588cc5efd909cdde58f4018 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 4d8ec47619..a1bfae1c93 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -175,5 +175,5 @@ 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.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.539125956 +0100
+++ 0087-doc-fix-typo-in-contributors-guide.patch	2020-06-05 19:20:50.992036678 +0100
@@ -1 +1 @@
-From ba8af67fcd7aea9f0d4956bc58b15c71d3319744 Mon Sep 17 00:00:00 2001
+From a28f45c97ec412e02588cc5efd909cdde58f4018 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ba8af67fcd7aea9f0d4956bc58b15c71d3319744 ]
+
@@ -8 +9,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
-index 5e6faa0c63..01e0a2f6ba 100644
+index 4d8ec47619..a1bfae1c93 100644
@@ -19 +20 @@
-@@ -183,5 +183,5 @@ applied without dependencies as a backport.
+@@ -175,5 +175,5 @@ applied without dependencies as a backport.



More information about the stable mailing list