patch 'net/hns3: delete duplicate macro definition' has been queued to stable release 21.11.5

Kevin Traynor ktraynor at redhat.com
Thu Jul 20 17:19:08 CEST 2023


Hi,

FYI, your patch has been queued to stable release 21.11.5

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/b870ca9679262199b6d34a18cb4b431ff8016782

Thanks.

Kevin

---
>From b870ca9679262199b6d34a18cb4b431ff8016782 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Thu, 29 Jun 2023 21:21:26 +0800
Subject: [PATCH] net/hns3: delete duplicate macro definition

[ upstream commit a939584a45dff2c5d855d25bf4867ba07428bdfc ]

This patch delete some duplicate macro definitions.

Fixes: a4c7152d0581 ("net/hns3: extract common code to its own file")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 878d4ae492..ff666c4979 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -877,11 +877,4 @@ struct hns3_adapter {
 };
 
-#define HNS3_DEVARG_RX_FUNC_HINT	"rx_func_hint"
-#define HNS3_DEVARG_TX_FUNC_HINT	"tx_func_hint"
-
-#define HNS3_DEVARG_DEV_CAPS_MASK	"dev_caps_mask"
-
-#define HNS3_DEVARG_MBX_TIME_LIMIT_MS	"mbx_time_limit_ms"
-
 enum {
 	HNS3_DEV_SUPPORT_DCB_B,
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:09.145840296 +0100
+++ 0117-net-hns3-delete-duplicate-macro-definition.patch	2023-07-20 16:17:55.115752362 +0100
@@ -1 +1 @@
-From a939584a45dff2c5d855d25bf4867ba07428bdfc Mon Sep 17 00:00:00 2001
+From b870ca9679262199b6d34a18cb4b431ff8016782 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a939584a45dff2c5d855d25bf4867ba07428bdfc ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index c58094d87b..c85a6912ad 100644
+index 878d4ae492..ff666c4979 100644
@@ -21 +22 @@
-@@ -874,11 +874,4 @@ struct hns3_adapter {
+@@ -877,11 +877,4 @@ struct hns3_adapter {
@@ -31 +32 @@
- enum hns3_dev_cap {
+ enum {



More information about the stable mailing list