[dpdk-stable] patch 'doc: fix HiSilicon copyright syntax' has been queued to stable release 20.11.2

Xueming Li xuemingl at nvidia.com
Mon May 10 18:02:43 CEST 2021


Hi,

FYI, your patch has been queued to stable release 20.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/f81a67f4b8c112329d2d8bd321d47e507395202b

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From f81a67f4b8c112329d2d8bd321d47e507395202b Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29 at huawei.com>
Date: Fri, 16 Apr 2021 18:34:29 +0800
Subject: [PATCH] doc: fix HiSilicon copyright syntax
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit be1650f734b7e478ce485587266e0f858c0cc21f ]

This patch fixes HiSilicon copyright syntax.

According to the suggestion of our legal department,
to standardize the copyright license of our code to
avoid potential copyright risks, we make a unified
modification to the "Hisilicon", which was nonstandard,
in the main modules we maintain.

We change it to "HiSilicon", which is consistent with
the terms used on the following official website:
https://www.hisilicon.com/en/terms-of-use.

Fixes: 565829db8b8f ("net/hns3: add build and doc infrastructure")

Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
 doc/guides/nics/hns3.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
index 84bd7a3c92..9a0196bbcf 100644
--- a/doc/guides/nics/hns3.rst
+++ b/doc/guides/nics/hns3.rst
@@ -1,12 +1,12 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2018-2019 Hisilicon Limited.
+    Copyright(c) 2018-2019 HiSilicon Limited.
 
 HNS3 Poll Mode Driver
 ===============================
 
 The hns3 PMD (**librte_net_hns3**) provides poll mode driver support
-for the inbuilt Hisilicon Network Subsystem(HNS) network engine
-found in the Hisilicon Kunpeng 920 SoC.
+for the inbuilt HiSilicon Network Subsystem(HNS) network engine
+found in the HiSilicon Kunpeng 920 SoC.
 
 Features
 --------
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:32.106842900 +0800
+++ 0215-doc-fix-HiSilicon-copyright-syntax.patch	2021-05-10 23:59:26.690000000 +0800
@@ -1 +1 @@
-From be1650f734b7e478ce485587266e0f858c0cc21f Mon Sep 17 00:00:00 2001
+From f81a67f4b8c112329d2d8bd321d47e507395202b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit be1650f734b7e478ce485587266e0f858c0cc21f ]
@@ -19 +21,0 @@
-Cc: stable at dpdk.org
@@ -27 +29 @@
-index 3366562968..20c7387996 100644
+index 84bd7a3c92..9a0196bbcf 100644


More information about the stable mailing list