[dpdk-stable] patch 'doc: add SPDX license tag header to meson guide' has been queued to LTS release 18.11.11

Kevin Traynor ktraynor at redhat.com
Wed Nov 18 17:35:20 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/24/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/988b3c139e8d8d65a1ee79b7892b1bbe17a33782

Thanks.

Kevin.

---
>From 988b3c139e8d8d65a1ee79b7892b1bbe17a33782 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 057734795e..69a80279f6 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -1,2 +1,5 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+    Copyright(c) 2018 Intel Corporation.
+
 INSTALLING DPDK USING THE MESON BUILD SYSTEM
 ---------------------------------------------
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:38.590295749 +0000
+++ 0034-doc-add-SPDX-license-tag-header-to-meson-guide.patch	2020-11-18 16:33:37.935215066 +0000
@@ -1 +1 @@
-From c0a775a141e3ee9f02aa0a75d975750d06890837 Mon Sep 17 00:00:00 2001
+From 988b3c139e8d8d65a1ee79b7892b1bbe17a33782 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c0a775a141e3ee9f02aa0a75d975750d06890837 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
- doc/guides/prog_guide/build-sdk-meson.rst | 3 +++
+ doc/build-sdk-meson.txt | 3 +++
@@ -20,4 +21,4 @@
-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 057734795e..69a80279f6 100644
+--- a/doc/build-sdk-meson.txt
++++ b/doc/build-sdk-meson.txt
@@ -28,2 +29,2 @@
- Installing DPDK Using the meson build system
- ============================================
+ INSTALLING DPDK USING THE MESON BUILD SYSTEM
+ ---------------------------------------------



More information about the stable mailing list