From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 3EE48A04DD
for <public@inbox.dpdk.org>; Wed, 18 Nov 2020 17:37:49 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id D7D96C940;
Wed, 18 Nov 2020 17:37:31 +0100 (CET)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [63.128.21.124])
by dpdk.org (Postfix) with ESMTP id 8E11DC93A
for <stable@dpdk.org>; Wed, 18 Nov 2020 17:37:29 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1605717448;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=GciQp0MpdfgQiJGCCbn+1cc4THKTrwozuG6goGgd8JU=;
b=gKCik2krQ7xJ72WpyUbHgivPLoI0IjaRti3FC4fNqzE4rtTkMaFccEHTlaptahCaSw8l/E
V8gE6k78p/JogXp7Ig1B5qPmCtnL0mbqGV5ng2FFV8w/7o3bFxR5YXMtE8L986uWJBy15q
YFjAigDBqRYN0hPVVHinEMLOnD+NliE=
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-30-nh1D604QNb--dla2AFoNLA-1; Wed, 18 Nov 2020 11:37:25 -0500
X-MC-Unique: nh1D604QNb--dla2AFoNLA-1
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
[10.5.11.16])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9967B87147B;
Wed, 18 Nov 2020 16:37:13 +0000 (UTC)
Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249])
by smtp.corp.redhat.com (Postfix) with ESMTP id 13C005C1A3;
Wed, 18 Nov 2020 16:37:11 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Ferruh Yigit <ferruh.yigit@intel.com>, dpdk stable <stable@dpdk.org>
Date: Wed, 18 Nov 2020 16:35:20 +0000
Message-Id: <20201118163558.1101823-34-ktraynor@redhat.com>
In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com>
References: <20201118163558.1101823-1-ktraynor@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
Subject: [dpdk-stable] patch 'doc: add SPDX license tag header to meson
guide' has been queued to LTS release 18.11.11
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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@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@networkplumber.org>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@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@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
+ ---------------------------------------------