[dpdk-stable] patch 'doc: add SPDX license tag header to 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 a44c2084e85921119acdecc48f25dcf7c7790f8e Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 10 Sep 2020 12:32:05 +0100
Subject: [PATCH] doc: add SPDX license tag header to meson guide

[ upstream commit c0a775a141e3ee9f02aa0a75d975750d06890837 ]

The build-sdk-meson.rst file originates from the short plain-text meson
instructions added in 2018. Add SPDX tag and copyright notice based on the
original commit.

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

Reported-by: Stephen Hemminger <stephen at networkplumber.org>
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 doc/build-sdk-meson.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index f3ff9289cb..8fb60a7c11 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -1,3 +1,6 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+    Copyright(c) 2018 Intel Corporation.
+
 INSTALLING DPDK USING THE MESON BUILD SYSTEM
 ---------------------------------------------
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:17.888011830 +0000
+++ 0200-doc-add-SPDX-license-tag-header-to-meson-guide.patch	2020-10-28 10:35:11.808834498 +0000
@@ -1,32 +1,33 @@
-From c0a775a141e3ee9f02aa0a75d975750d06890837 Mon Sep 17 00:00:00 2001
+From a44c2084e85921119acdecc48f25dcf7c7790f8e Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Thu, 10 Sep 2020 12:32:05 +0100
 Subject: [PATCH] doc: add SPDX license tag header to meson guide
 
+[ upstream commit c0a775a141e3ee9f02aa0a75d975750d06890837 ]
+
 The build-sdk-meson.rst file originates from the short plain-text meson
 instructions added in 2018. Add SPDX tag and copyright notice based on the
 original commit.
 
 Fixes: 9c3adc289c5e ("doc: add instructions on build using meson")
-Cc: stable at dpdk.org
 
 Reported-by: Stephen Hemminger <stephen at networkplumber.org>
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- doc/guides/prog_guide/build-sdk-meson.rst | 3 +++
+ doc/build-sdk-meson.txt | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
-index d621bea565..3429e26479 100644
---- a/doc/guides/prog_guide/build-sdk-meson.rst
-+++ b/doc/guides/prog_guide/build-sdk-meson.rst
+diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
+index f3ff9289cb..8fb60a7c11 100644
+--- a/doc/build-sdk-meson.txt
++++ b/doc/build-sdk-meson.txt
 @@ -1,3 +1,6 @@
 +..  SPDX-License-Identifier: BSD-3-Clause
 +    Copyright(c) 2018 Intel Corporation.
 +
- Installing DPDK Using the meson build system
- ============================================
+ INSTALLING DPDK USING THE MESON BUILD SYSTEM
+ ---------------------------------------------
  
 -- 
 2.20.1