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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 2f766df7721e1cc8e7e2b00a8ea9b4b343ed57fb 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 fdfa6fdd5a..e54a5ff4d2 100644
--- a/doc/guides/nics/dpaa2.rst
+++ b/doc/guides/nics/dpaa2.rst
@@ -1,5 +1,5 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright 2016 NXP
+    Copyright 2016,2020 NXP
 
 
 DPAA2 Poll Mode Driver
@@ -300,7 +300,7 @@ The diagram below shows the dpaa2 drivers involved in a networking
 scenario and the objects bound to each driver.  A brief description
 of each driver follows.
 
-.. code-block: console
+.. code-block:: console
 
 
                                        +------------+
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:15.904887995 +0000
+++ 0134-doc-fix-diagram-in-dpaa2-guide.patch	2020-10-28 10:35:11.704832968 +0000
@@ -1,8 +1,10 @@
-From 1736219b3c5737c943620c22121b361e35b18d0d Mon Sep 17 00:00:00 2001
+From 2f766df7721e1cc8e7e2b00a8ea9b4b343ed57fb 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.
 
@@ -10,7 +12,6 @@
 to make it visible in generated doc file.
 
 Fixes: 846a8305f277 ("doc: add DPAA2 NIC details")
-Cc: stable at dpdk.org
 
 Signed-off-by: Sachin Saxena <sachin.saxena at oss.nxp.com>
 ---
@@ -18,7 +19,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst
-index d656b7f7a5..ca6ba5b5e2 100644
+index fdfa6fdd5a..e54a5ff4d2 100644
 --- a/doc/guides/nics/dpaa2.rst
 +++ b/doc/guides/nics/dpaa2.rst
 @@ -1,5 +1,5 @@