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

Christian Ehrhardt christian.ehrhardt at canonical.com
Mon May 17 18:09:20 CEST 2021


Hi,

FYI, your patch has been queued to stable release 19.11.9

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/19/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/9aa7c35c774a26afe24464188d0e9c33a29ca493

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 9aa7c35c774a26afe24464188d0e9c33a29ca493 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

[ 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 567c65d536..7eb6d727ca 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_pmd_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.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:34.554643877 +0200
+++ 0131-doc-fix-HiSilicon-copyright-syntax.patch	2021-05-17 17:40:29.387811178 +0200
@@ -1 +1 @@
-From be1650f734b7e478ce485587266e0f858c0cc21f Mon Sep 17 00:00:00 2001
+From 9aa7c35c774a26afe24464188d0e9c33a29ca493 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit be1650f734b7e478ce485587266e0f858c0cc21f ]
+
@@ -19 +20,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 3366562968..20c7387996 100644
+index 567c65d536..7eb6d727ca 100644
@@ -38 +39 @@
- The hns3 PMD (**librte_net_hns3**) provides poll mode driver support
+ The hns3 PMD (librte_pmd_hns3) provides poll mode driver support


More information about the stable mailing list