[dpdk-stable] patch 'doc: fix formatting of notes in meson 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 b8ec7ffe965b43ce7c4b84185605d21bbb65aae1 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 3 Sep 2020 15:00:33 +0100
Subject: [PATCH] doc: fix formatting of notes in meson guide

[ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ]

The "note" callouts in the chapter describing the meson build were
incorrectly formatted, so adjust to use the correct markdown syntax.

Fixes: 9c3adc289c5e ("doc: add instructions on build using meson")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: John McNamara <john.mcnamara at intel.com>
---
 doc/build-sdk-meson.txt | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index 3a3682cd44..f3ff9289cb 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -94,14 +94,17 @@ Examples of setting the same options using meson configure::
 
 	meson configure -Dmax_lcores=8
 
-NOTE: once meson has been run to configure a build in a directory, it
-cannot be run again on the same directory. Instead ``meson configure``
-should be used to change the build settings within the directory, and when
-``ninja`` is called to do the build itself, it will trigger the necessary
-re-scan from meson.
+.. note::
 
-NOTE: machine=default uses a config that works on all supported architectures
-regardless of the capabilities of the machine where the build is happening.
+        once meson has been run to configure a build in a directory, it
+        cannot be run again on the same directory. Instead ``meson configure``
+        should be used to change the build settings within the directory, and when
+        ``ninja`` is called to do the build itself, it will trigger the necessary
+        re-scan from meson.
+
+.. note::
+        machine=default uses a config that works on all supported architectures
+        regardless of the capabilities of the machine where the build is happening.
 
 As well as those settings taken from ``meson configure``, other options
 such as the compiler to use can be passed via environment variables. For
@@ -109,9 +112,11 @@ example::
 
 	CC=clang meson clang-build
 
-NOTE: for more comprehensive overriding of compilers or other environment
-settings, the tools for cross-compilation may be considered. However, for
-basic overriding of the compiler etc., the above form works as expected.
+.. note::
+
+        for more comprehensive overriding of compilers or other environment
+        settings, the tools for cross-compilation may be considered. However, for
+        basic overriding of the compiler etc., the above form works as expected.
 
 
 Performing the Build
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:15.005957276 +0000
+++ 0104-doc-fix-formatting-of-notes-in-meson-guide.patch	2020-10-28 10:35:11.656832261 +0000
@@ -1,27 +1,28 @@
-From 1509ef9350671ee13381ce8e3c1741c2effc28b1 Mon Sep 17 00:00:00 2001
+From b8ec7ffe965b43ce7c4b84185605d21bbb65aae1 Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Thu, 3 Sep 2020 15:00:33 +0100
 Subject: [PATCH] doc: fix formatting of notes in meson guide
 
+[ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ]
+
 The "note" callouts in the chapter describing the meson build were
 incorrectly formatted, so adjust to use the correct markdown syntax.
 
 Fixes: 9c3adc289c5e ("doc: add instructions on build using meson")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: John McNamara <john.mcnamara at intel.com>
 ---
- doc/guides/prog_guide/build-sdk-meson.rst | 25 ++++++++++++++---------
+ doc/build-sdk-meson.txt | 25 +++++++++++++++----------
  1 file changed, 15 insertions(+), 10 deletions(-)
 
-diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
-index 44d1cafdf0..d621bea565 100644
---- a/doc/guides/prog_guide/build-sdk-meson.rst
-+++ b/doc/guides/prog_guide/build-sdk-meson.rst
-@@ -102,14 +102,17 @@ Examples of setting some of the same options using meson configure::
+diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
+index 3a3682cd44..f3ff9289cb 100644
+--- a/doc/build-sdk-meson.txt
++++ b/doc/build-sdk-meson.txt
+@@ -94,14 +94,17 @@ Examples of setting the same options using meson configure::
  
- 	meson configure -Denable_trace_fp=true
+ 	meson configure -Dmax_lcores=8
  
 -NOTE: once meson has been run to configure a build in a directory, it
 -cannot be run again on the same directory. Instead ``meson configure``
@@ -44,7 +45,7 @@
  
  As well as those settings taken from ``meson configure``, other options
  such as the compiler to use can be passed via environment variables. For
-@@ -117,9 +120,11 @@ example::
+@@ -109,9 +112,11 @@ example::
  
  	CC=clang meson clang-build