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 91E344301F for ; Thu, 10 Aug 2023 02:00:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BECF4324E; Thu, 10 Aug 2023 02:00:56 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2071.outbound.protection.outlook.com [40.107.243.71]) by mails.dpdk.org (Postfix) with ESMTP id 1BDB640DD8 for ; Thu, 10 Aug 2023 02:00:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KawkJUA82tmAr7cB/TN6SM+RapPr1SmuoDGEAMmAGXmOqW6DZKd7G61rkbaHih2vmbN/LHyXH7laQaLe1fr5conpVtHWFLx+TaiY4O6UCA9D+k2jP6ksrZPdNlCpEHyRglFa7Zqf9mSJqEMvsMGaK15fG8zPwocpflrvhlFu/GZh3CeX7rKfQpSlRNgUOgxhV8HAbzuO0X/OlSBFAZGoIjz3QwoxIucZwdJnajZBnBfLfMeozc50XLq4IXXXFOEgBo4IcIlFGYsdeBQiFyV6YZnMTDrT9TO7a89RPlMe1UeH3uqgwinmeWualHr/r2T3jzKPmsLjt73mSdV5jqd3gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=S3CF++SxyKto6M35amh1whBoVeFMMYXFHuD4oWKfIxY=; b=RPHeQSWF4GbzuMLu1x2xJp18t4eVspa8vFbRyZC1wFXJYtnXX6HQgU7ReY8j0hUW4tzwDgLYerlE2xyoWH+kYetnGzJVQs2OenuYDxCVsMLBVgH/n1kj5Xs1XVYWj6pICLZOV9dW30oa0p3ba4sCqPy1rzMYThD122OE3j8fIohW7Kqv8L2ilzwyxARQft92GCu5p17CRKcrZzokkmStgbsibDUfqhoASRN625+SQ3osa0pCfxZDz4KUiYq6cukoqZXgxj9PF347YAubNKO+jRfClNxswTwLhm54/VDabh7bJv4XIaWv11DsGHpkrYYZYe1wVvwVf2drvUpjWxgJxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S3CF++SxyKto6M35amh1whBoVeFMMYXFHuD4oWKfIxY=; b=fdNgbwXIkbhYVcRv8YQHkky+r2vpued1TbTFOKF9oyoVpgo+YuAaarbRkodIqYfRyP9N0GMq2AQnBXTaynxHFTXjDkBgh5xsvk9+3s2rOabuZvIKjHaEflkz9WvGYbvM2hDTRKh7Sl5hIxZxabhlJVSoYCfEupLd+fxrxjmBie3FP/UIc3BAxJUxOp8905e1kERcehnmWsiFze8OhGyj0rFx+E5wtRaPOSf1IcNm5Y1rEFf+PmQ6m3ab0shWg3pu1f57nWLU/27uczsQ5aO4PjvIu8b36NhVEMXpxVcmc2LPc5b1IbulJljyIe39RZh3Ivomk4q3o6ArlsfGZsvN9g== Received: from MW4PR04CA0277.namprd04.prod.outlook.com (2603:10b6:303:89::12) by BN9PR12MB5290.namprd12.prod.outlook.com (2603:10b6:408:103::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:00:52 +0000 Received: from CO1PEPF000042AA.namprd03.prod.outlook.com (2603:10b6:303:89:cafe::ad) by MW4PR04CA0277.outlook.office365.com (2603:10b6:303:89::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30 via Frontend Transport; Thu, 10 Aug 2023 00:00:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042AA.mail.protection.outlook.com (10.167.243.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:00:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 17:00:33 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Wed, 9 Aug 2023 17:00:32 -0700 From: Xueming Li To: Huisong Li CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: delete duplicate macro definition' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:58:40 +0800 Message-ID: <20230809235947.1187-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809235947.1187-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809235947.1187-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AA:EE_|BN9PR12MB5290:EE_ X-MS-Office365-Filtering-Correlation-Id: 601e8aca-08a0-47b7-9fc1-08db9934dc11 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1GrKGS+RhZDWOiWLIZUW/A7Ag0yngvx7enQ/1q+zMESqluKFm7T+P5cyQVC6BiHT0Y+mASNM/5QEcN9WxhUVfVGbO4GnzU5mmkmNGqVHZeW/q+kwB70HbKS0+d2NOtkmc84IdE1BNh6iCXSh3E0xYu/eVQ8hz1WWeMothLlkVMVXQ2dl15dXBIzGOjUNiMKA0+MQ85T/FGUuBECd4xPohZUxz6SZGgmlzf11At7xCmG+JyFshh8NyM+o/43ttzN5xJRJYUqbFegBqxdWV0okgjX9FQadC9Ut5cWcT89sVKriNHyNf5C2BXTVKYo6jytDoTprFBVuWIfdteAwJLxWtg+ODm2LaFDdMxOiXYr7S1CtGAcvcDLBwHBpyDy3p7VP3Cy8uv4MCPqpXGEa1g7tRvW0l74r5kkzCZ0wshOCgJ7pmoXI4dKprTRy4Bf6nV6m8DCCijOZ22vtc3d5UFjCoWybWWRWu6cq19SR1r/RGyyav2cxYXZJs6lDEgEQa0lTU9Xw0dD1VwoIlra5PehKIfWSvpsXQ8w76GlHYb5oek9BsYe82qLLQw3YWPFyl1t3tWGHMG+UY+bZYzcIM99i8ny7tMJ6X0ACH9uMZCTqY8LOufuIWNSW9VB2u4fkHEipTRR+j9kBNkx1GmRQTS2gBp+7PfLNR6PwJGJOkELZmGPzotokokN3p0qEhKAJWSgZtAZjcMGNroLpZ+b2AOv1fgKjhylPKBASNXUrHrMJ2/uTar0tthUfJ3o5CwzjCal/ib3Tmhsu3Tq6YiKPC/1cqg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(376002)(39860400002)(346002)(451199021)(186006)(1800799006)(82310400008)(36840700001)(40470700004)(46966006)(4326008)(6916009)(316002)(54906003)(478600001)(2906002)(82740400003)(336012)(40460700003)(5660300002)(41300700001)(36860700001)(1076003)(26005)(966005)(36756003)(40480700001)(55016003)(70586007)(70206006)(6666004)(86362001)(8676002)(7696005)(8936002)(7636003)(356005)(2616005)(6286002)(47076005)(16526019)(83380400001)(53546011)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:00:51.1142 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 601e8aca-08a0-47b7-9fc1-08db9934dc11 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5290 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 Hi, FYI, your patch has been queued to stable release 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=9b9ae1aff19d9b03c75f3c84183bb8fcfce2320f Thanks. Xueming Li --- >From 9b9ae1aff19d9b03c75f3c84183bb8fcfce2320f Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Thu, 29 Jun 2023 21:21:26 +0800 Subject: [PATCH] net/hns3: delete duplicate macro definition Cc: Xueming Li [ 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 Signed-off-by: Dongdong Liu --- 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 046a37b7d3..58572948fe 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -871,13 +871,6 @@ struct hns3_adapter { struct hns3_ptype_table ptype_tbl __rte_cache_aligned; }; -#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_cap { HNS3_DEV_SUPPORT_DCB_B, HNS3_DEV_SUPPORT_COPPER_B, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.747353800 +0800 +++ 0061-net-hns3-delete-duplicate-macro-definition.patch 2023-08-09 21:51:18.204352000 +0800 @@ -1 +1 @@ -From a939584a45dff2c5d855d25bf4867ba07428bdfc Mon Sep 17 00:00:00 2001 +From 9b9ae1aff19d9b03c75f3c84183bb8fcfce2320f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a939584a45dff2c5d855d25bf4867ba07428bdfc ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index c58094d87b..c85a6912ad 100644 +index 046a37b7d3..58572948fe 100644 @@ -21 +23 @@ -@@ -873,13 +873,6 @@ struct hns3_adapter { +@@ -871,13 +871,6 @@ struct hns3_adapter {