[dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' has been queued to LTS release 18.11.11

Kevin Traynor ktraynor at redhat.com
Thu Nov 5 13:40:04 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.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 11/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/cbc5a413261c200a190a66763e446ff936647c6b

Thanks.

Kevin.

---
>From cbc5a413261c200a190a66763e446ff936647c6b Mon Sep 17 00:00:00 2001
From: Sachin Saxena <sachin.saxena at oss.nxp.com>
Date: Thu, 8 Oct 2020 08:43:57 +0530
Subject: [PATCH] doc: fix diagram in dpaa2 guide

[ upstream commit 1736219b3c5737c943620c22121b361e35b18d0d ]

The diagram to show dpaa2 drivers brief
was missing in dpaa2.html file.

fix a typo in encoding for a literal block
to make it visible in generated doc file.

Fixes: 846a8305f277 ("doc: add DPAA2 NIC details")

Signed-off-by: Sachin Saxena <sachin.saxena at oss.nxp.com>
---
 doc/guides/nics/dpaa2.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst
index 04370e4cd5..78a8ae589b 100644
--- a/doc/guides/nics/dpaa2.rst
+++ b/doc/guides/nics/dpaa2.rst
@@ -1,4 +1,4 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright 2016 NXP
+    Copyright 2016,2020 NXP
 
 
@@ -301,5 +301,5 @@ scenario and the objects bound to each driver.  A brief description
 of each driver follows.
 
-.. code-block: console
+.. code-block:: console
 
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.458371149 +0000
+++ 0057-doc-fix-diagram-in-dpaa2-guide.patch	2020-11-05 12:38:54.256896032 +0000
@@ -1 +1 @@
-From 1736219b3c5737c943620c22121b361e35b18d0d Mon Sep 17 00:00:00 2001
+From cbc5a413261c200a190a66763e446ff936647c6b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1736219b3c5737c943620c22121b361e35b18d0d ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index d656b7f7a5..ca6ba5b5e2 100644
+index 04370e4cd5..78a8ae589b 100644



More information about the stable mailing list