[dpdk-stable] patch 'doc: fix formatting of notes in meson guide' has been queued to LTS release 18.11.11

[Kevin Traynor]

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/fb7bce81c5dbb7366764588d25130ac3f88a6f6c

Thanks.

Kevin.

---
>From fb7bce81c5dbb7366764588d25130ac3f88a6f6c 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 | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index 29a8bd387f..057734795e 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -98,9 +98,11 @@ 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::
+
+        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.
 
 As well as those settings taken from ``meson configure``, other options
@@ -110,7 +112,9 @@ 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.
 
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.057244546 +0000
+++ 0042-doc-fix-formatting-of-notes-in-meson-guide.patch	2020-11-05 12:38:54.242896021 +0000
@@ -1 +1 @@
-From 1509ef9350671ee13381ce8e3c1741c2effc28b1 Mon Sep 17 00:00:00 2001
+From fb7bce81c5dbb7366764588d25130ac3f88a6f6c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1509ef9350671ee13381ce8e3c1741c2effc28b1 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- doc/guides/prog_guide/build-sdk-meson.rst | 25 ++++++++++++++---------
- 1 file changed, 15 insertions(+), 10 deletions(-)
+ doc/build-sdk-meson.txt | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
@@ -18,6 +19,6 @@
-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
-@@ -103,12 +103,15 @@ Examples of setting some of the same options using meson configure::
- 	meson configure -Denable_trace_fp=true
+diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
+index 29a8bd387f..057734795e 100644
+--- a/doc/build-sdk-meson.txt
++++ b/doc/build-sdk-meson.txt
+@@ -98,9 +98,11 @@ Examples of setting the same options using meson configure::
+ 	meson configure -Dmax_lcores=8
@@ -31,3 +32 @@
- 
--NOTE: machine=default uses a config that works on all supported architectures
--regardless of the capabilities of the machine where the build is happening.
++
@@ -39,4 +37,0 @@
-+
-+.. note::
-+        machine=default uses a config that works on all supported architectures
-+        regardless of the capabilities of the machine where the build is happening.
@@ -45 +40 @@
-@@ -118,7 +121,9 @@ example::
+@@ -110,7 +112,9 @@ example::