From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 02BD5A0A02 for ; Mon, 17 May 2021 18:13:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E78D641102; Mon, 17 May 2021 18:13:53 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 2EA1340041 for ; Mon, 17 May 2021 18:13:53 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifsO-0007zX-Vf; Mon, 17 May 2021 16:13:53 +0000 From: Christian Ehrhardt To: "Min Hu (Connor)" Cc: dpdk stable Date: Mon, 17 May 2021 18:08:33 +0200 Message-Id: <20210517161039.3132619-84-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: update HiSilicon copyright syntax' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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/8119dd902993c88c1c081fc948603d434c41cae5 Thanks. Christian Ehrhardt --- >From 8119dd902993c88c1c081fc948603d434c41cae5 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Tue, 6 Apr 2021 08:57:36 +0800 Subject: [PATCH] net/hns3: update HiSilicon copyright syntax [ upstream commit fa485faca236bd0ac834b6ad7c36f5050305482e ] 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") Fixes: 952ebacce4f2 ("net/hns3: support SVE Rx") Fixes: e31f123db06b ("net/hns3: support NEON Tx") Fixes: c09c7847d892 ("net/hns3: support traffic management") Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_cmd.c | 2 +- drivers/net/hns3/hns3_cmd.h | 2 +- drivers/net/hns3/hns3_dcb.c | 2 +- drivers/net/hns3/hns3_dcb.h | 2 +- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev.h | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/hns3/hns3_fdir.c | 2 +- drivers/net/hns3/hns3_fdir.h | 2 +- drivers/net/hns3/hns3_flow.c | 2 +- drivers/net/hns3/hns3_intr.c | 2 +- drivers/net/hns3/hns3_intr.h | 2 +- drivers/net/hns3/hns3_logs.h | 2 +- drivers/net/hns3/hns3_mbx.c | 2 +- drivers/net/hns3/hns3_mbx.h | 2 +- drivers/net/hns3/hns3_mp.c | 2 +- drivers/net/hns3/hns3_mp.h | 2 +- drivers/net/hns3/hns3_regs.c | 2 +- drivers/net/hns3/hns3_regs.h | 2 +- drivers/net/hns3/hns3_rss.c | 2 +- drivers/net/hns3/hns3_rss.h | 2 +- drivers/net/hns3/hns3_rxtx.c | 2 +- drivers/net/hns3/hns3_rxtx.h | 2 +- drivers/net/hns3/hns3_stats.c | 2 +- drivers/net/hns3/hns3_stats.h | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c index dc2473a0f7..d7de2bc981 100644 --- a/drivers/net/hns3/hns3_cmd.c +++ b/drivers/net/hns3/hns3_cmd.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h index 5a7b7a44e0..9c3c68c3e2 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_CMD_H_ diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c index 62d8930c15..7a2ba795cc 100644 --- a/drivers/net/hns3/hns3_dcb.c +++ b/drivers/net/hns3/hns3_dcb.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_dcb.h b/drivers/net/hns3/hns3_dcb.h index fe67d3a466..ff406bc693 100644 --- a/drivers/net/hns3/hns3_dcb.h +++ b/drivers/net/hns3/hns3_dcb.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_DCB_H_ diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 505bf116eb..315baaa84f 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 8ba22dc424..e65b38c881 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_ETHDEV_H_ diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 0c21a20740..913d6fd406 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c index 98a044f567..a55ce0bf42 100644 --- a/drivers/net/hns3/hns3_fdir.c +++ b/drivers/net/hns3/hns3_fdir.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_fdir.h b/drivers/net/hns3/hns3_fdir.h index f7b4216136..0c78121ded 100644 --- a/drivers/net/hns3/hns3_fdir.h +++ b/drivers/net/hns3/hns3_fdir.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_FDIR_H_ diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index b1d3d81aee..5d9d30624c 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c index 46d617c68e..3c754cccd2 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_intr.h b/drivers/net/hns3/hns3_intr.h index d0af16c502..cf390de5dd 100644 --- a/drivers/net/hns3/hns3_intr.h +++ b/drivers/net/hns3/hns3_intr.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_INTR_H_ diff --git a/drivers/net/hns3/hns3_logs.h b/drivers/net/hns3/hns3_logs.h index f3fc7b51d6..aa135db982 100644 --- a/drivers/net/hns3/hns3_logs.h +++ b/drivers/net/hns3/hns3_logs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_LOGS_H_ diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c index 64996c9ae1..b7d0519131 100644 --- a/drivers/net/hns3/hns3_mbx.c +++ b/drivers/net/hns3/hns3_mbx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_mbx.h b/drivers/net/hns3/hns3_mbx.h index b01eaacc3c..7065111a61 100644 --- a/drivers/net/hns3/hns3_mbx.h +++ b/drivers/net/hns3/hns3_mbx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_MBX_H_ diff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c index 639f46ced8..ecfba447a2 100644 --- a/drivers/net/hns3/hns3_mp.c +++ b/drivers/net/hns3/hns3_mp.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_mp.h b/drivers/net/hns3/hns3_mp.h index 036546ae11..60ef2315db 100644 --- a/drivers/net/hns3/hns3_mp.h +++ b/drivers/net/hns3/hns3_mp.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_MP_H_ diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c index 2f34357d48..7093a97ccc 100644 --- a/drivers/net/hns3/hns3_regs.c +++ b/drivers/net/hns3/hns3_regs.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_regs.h b/drivers/net/hns3/hns3_regs.h index 64bd6931b3..2535bc977a 100644 --- a/drivers/net/hns3/hns3_regs.h +++ b/drivers/net/hns3/hns3_regs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_REGS_H_ diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index a63d6ef725..21ed875f26 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index b49e399901..a03e7df6bb 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_RSS_H_ diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 5971cf6cd5..1deaf4e6be 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h index 88a75843b3..fbe3dd0ab8 100644 --- a/drivers/net/hns3/hns3_rxtx.h +++ b/drivers/net/hns3/hns3_rxtx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_RXTX_H_ diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c index d2ef722cfb..3dff75c730 100644 --- a/drivers/net/hns3/hns3_stats.c +++ b/drivers/net/hns3/hns3_stats.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #include diff --git a/drivers/net/hns3/hns3_stats.h b/drivers/net/hns3/hns3_stats.h index 34c76be21e..c51e835cde 100644 --- a/drivers/net/hns3/hns3_stats.h +++ b/drivers/net/hns3/hns3_stats.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018-2019 Hisilicon Limited. + * Copyright(c) 2018-2019 HiSilicon Limited. */ #ifndef _HNS3_STATS_H_ -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.781077330 +0200 +++ 0084-net-hns3-update-HiSilicon-copyright-syntax.patch 2021-05-17 17:40:29.263810201 +0200 @@ -1 +1 @@ -From fa485faca236bd0ac834b6ad7c36f5050305482e Mon Sep 17 00:00:00 2001 +From 8119dd902993c88c1c081fc948603d434c41cae5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fa485faca236bd0ac834b6ad7c36f5050305482e ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -24,32 +25,26 @@ - drivers/net/hns3/hns3_cmd.c | 2 +- - drivers/net/hns3/hns3_cmd.h | 2 +- - drivers/net/hns3/hns3_dcb.c | 2 +- - drivers/net/hns3/hns3_dcb.h | 2 +- - drivers/net/hns3/hns3_ethdev.c | 2 +- - drivers/net/hns3/hns3_ethdev.h | 2 +- - drivers/net/hns3/hns3_ethdev_vf.c | 2 +- - drivers/net/hns3/hns3_fdir.c | 2 +- - drivers/net/hns3/hns3_fdir.h | 2 +- - drivers/net/hns3/hns3_flow.c | 2 +- - drivers/net/hns3/hns3_intr.c | 2 +- - drivers/net/hns3/hns3_intr.h | 2 +- - drivers/net/hns3/hns3_logs.h | 2 +- - drivers/net/hns3/hns3_mbx.c | 2 +- - drivers/net/hns3/hns3_mbx.h | 2 +- - drivers/net/hns3/hns3_mp.c | 2 +- - drivers/net/hns3/hns3_mp.h | 2 +- - drivers/net/hns3/hns3_regs.c | 2 +- - drivers/net/hns3/hns3_regs.h | 2 +- - drivers/net/hns3/hns3_rss.c | 2 +- - drivers/net/hns3/hns3_rss.h | 2 +- - drivers/net/hns3/hns3_rxtx.c | 2 +- - drivers/net/hns3/hns3_rxtx.h | 2 +- - drivers/net/hns3/hns3_rxtx_vec.c | 2 +- - drivers/net/hns3/hns3_rxtx_vec.h | 2 +- - drivers/net/hns3/hns3_rxtx_vec_neon.h | 2 +- - drivers/net/hns3/hns3_rxtx_vec_sve.c | 2 +- - drivers/net/hns3/hns3_stats.c | 2 +- - drivers/net/hns3/hns3_stats.h | 2 +- - drivers/net/hns3/hns3_tm.c | 2 +- - drivers/net/hns3/hns3_tm.h | 2 +- - 31 files changed, 31 insertions(+), 31 deletions(-) + drivers/net/hns3/hns3_cmd.c | 2 +- + drivers/net/hns3/hns3_cmd.h | 2 +- + drivers/net/hns3/hns3_dcb.c | 2 +- + drivers/net/hns3/hns3_dcb.h | 2 +- + drivers/net/hns3/hns3_ethdev.c | 2 +- + drivers/net/hns3/hns3_ethdev.h | 2 +- + drivers/net/hns3/hns3_ethdev_vf.c | 2 +- + drivers/net/hns3/hns3_fdir.c | 2 +- + drivers/net/hns3/hns3_fdir.h | 2 +- + drivers/net/hns3/hns3_flow.c | 2 +- + drivers/net/hns3/hns3_intr.c | 2 +- + drivers/net/hns3/hns3_intr.h | 2 +- + drivers/net/hns3/hns3_logs.h | 2 +- + drivers/net/hns3/hns3_mbx.c | 2 +- + drivers/net/hns3/hns3_mbx.h | 2 +- + drivers/net/hns3/hns3_mp.c | 2 +- + drivers/net/hns3/hns3_mp.h | 2 +- + drivers/net/hns3/hns3_regs.c | 2 +- + drivers/net/hns3/hns3_regs.h | 2 +- + drivers/net/hns3/hns3_rss.c | 2 +- + drivers/net/hns3/hns3_rss.h | 2 +- + drivers/net/hns3/hns3_rxtx.c | 2 +- + drivers/net/hns3/hns3_rxtx.h | 2 +- + drivers/net/hns3/hns3_stats.c | 2 +- + drivers/net/hns3/hns3_stats.h | 2 +- + 25 files changed, 25 insertions(+), 25 deletions(-) @@ -58 +53 @@ -index 03f8048f27..1087178373 100644 +index dc2473a0f7..d7de2bc981 100644 @@ -67 +62 @@ - #include + #include @@ -69 +64 @@ -index 5d1fb67644..9ca25295b2 100644 +index 5a7b7a44e0..9c3c68c3e2 100644 @@ -80 +75 @@ -index ebfc24044f..3fcec8220e 100644 +index 62d8930c15..7a2ba795cc 100644 @@ -89 +84 @@ - #include + #include @@ -91 +86 @@ -index 0d25d3b7ab..9c60ab948a 100644 +index fe67d3a466..ff406bc693 100644 @@ -102 +97 @@ -index f695db3784..a9e2e93528 100644 +index 505bf116eb..315baaa84f 100644 @@ -111 +106 @@ - #include + #include @@ -113 +108 @@ -index d23239d2e1..d666b1a1e9 100644 +index 8ba22dc424..e65b38c881 100644 @@ -124 +119 @@ -index 6c3ddcc50e..a677cc809f 100644 +index 0c21a20740..913d6fd406 100644 @@ -133 +128 @@ - #include + #include @@ -135 +130 @@ -index 896540df78..658f6a6fc1 100644 +index 98a044f567..a55ce0bf42 100644 @@ -144 +139 @@ - #include + #include @@ -146 +141 @@ -index a5760a3ccf..b77745f221 100644 +index f7b4216136..0c78121ded 100644 @@ -157 +152 @@ -index 0c4e91109c..366a301fe8 100644 +index b1d3d81aee..5d9d30624c 100644 @@ -166 +161 @@ - #include + #include @@ -168 +163 @@ -index c259f2e4a5..c8d61376cf 100644 +index 46d617c68e..3c754cccd2 100644 @@ -177 +172 @@ - #include + #include @@ -179 +174 @@ -index c569a9de37..e10e0941ff 100644 +index d0af16c502..cf390de5dd 100644 @@ -201 +196 @@ -index 61d15845e7..597a2d1299 100644 +index 64996c9ae1..b7d0519131 100644 @@ -210 +205 @@ - #include + #include @@ -212 +207 @@ -index 7f7ade13fa..7f5fdd24f4 100644 +index b01eaacc3c..7065111a61 100644 @@ -223 +218 @@ -index 3342a781ad..cfee30f77f 100644 +index 639f46ced8..ecfba447a2 100644 @@ -232 +227 @@ - #include + #include @@ -245 +240 @@ -index 4022bb990d..d53c132b1e 100644 +index 2f34357d48..7093a97ccc 100644 @@ -254 +249 @@ - #include + #include @@ -256 +251 @@ -index c9e10be6b3..7f05f8be79 100644 +index 64bd6931b3..2535bc977a 100644 @@ -267 +262 @@ -index 858e31a234..226ec25150 100644 +index a63d6ef725..21ed875f26 100644 @@ -276 +271 @@ - #include + #include @@ -278 +273 @@ -index 94668ed6d5..da2375e2ee 100644 +index b49e399901..a03e7df6bb 100644 @@ -289 +284 @@ -index 70cd2c2306..64a0cd4f25 100644 +index 5971cf6cd5..1deaf4e6be 100644 @@ -298 +293 @@ - #include + #include @@ -300 +295 @@ -index eebbebf8c2..cfe6cadaf5 100644 +index 88a75843b3..fbe3dd0ab8 100644 @@ -310,44 +304,0 @@ -diff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c -index 030bfdb627..60018ea3fb 100644 ---- a/drivers/net/hns3/hns3_rxtx_vec.c -+++ b/drivers/net/hns3/hns3_rxtx_vec.c -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: BSD-3-Clause -- * Copyright(c) 2020 Hisilicon Limited. -+ * Copyright(c) 2020 HiSilicon Limited. - */ - - #include -diff --git a/drivers/net/hns3/hns3_rxtx_vec.h b/drivers/net/hns3/hns3_rxtx_vec.h -index 35d99032f4..08a3b3c539 100644 ---- a/drivers/net/hns3/hns3_rxtx_vec.h -+++ b/drivers/net/hns3/hns3_rxtx_vec.h -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: BSD-3-Clause -- * Copyright(c) 2020 Hisilicon Limited. -+ * Copyright(c) 2020 HiSilicon Limited. - */ - - #ifndef _HNS3_RXTX_VEC_H_ -diff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h b/drivers/net/hns3/hns3_rxtx_vec_neon.h -index 68f098f2f5..b27fce85f8 100644 ---- a/drivers/net/hns3/hns3_rxtx_vec_neon.h -+++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: BSD-3-Clause -- * Copyright(c) 2020 Hisilicon Limited. -+ * Copyright(c) 2020 HiSilicon Limited. - */ - - #ifndef _HNS3_RXTX_VEC_NEON_H_ -diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c -index 40fe6f743f..ef3a756195 100644 ---- a/drivers/net/hns3/hns3_rxtx_vec_sve.c -+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: BSD-3-Clause -- * Copyright(c) 2020 Hisilicon Limited. -+ * Copyright(c) 2020 HiSilicon Limited. - */ - - #include @@ -355 +306 @@ -index 1af689ff09..fdada8ba3c 100644 +index d2ef722cfb..3dff75c730 100644 @@ -364 +315 @@ - #include + #include @@ -366 +317 @@ -index 273be4246f..88ac4cd500 100644 +index 34c76be21e..c51e835cde 100644 @@ -376,22 +326,0 @@ -diff --git a/drivers/net/hns3/hns3_tm.c b/drivers/net/hns3/hns3_tm.c -index bcae57aefa..15e00b6e9c 100644 ---- a/drivers/net/hns3/hns3_tm.c -+++ b/drivers/net/hns3/hns3_tm.c -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: BSD-3-Clause -- * Copyright(c) 2020-2020 Hisilicon Limited. -+ * Copyright(c) 2020-2020 HiSilicon Limited. - */ - - #include -diff --git a/drivers/net/hns3/hns3_tm.h b/drivers/net/hns3/hns3_tm.h -index d8de3e49ed..9ccbb22682 100644 ---- a/drivers/net/hns3/hns3_tm.h -+++ b/drivers/net/hns3/hns3_tm.h -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: BSD-3-Clause -- * Copyright(c) 2020-2020 Hisilicon Limited. -+ * Copyright(c) 2020-2020 HiSilicon Limited. - */ - - #ifndef _HNS3_TM_H_