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 45E4E4625C for ; Tue, 18 Feb 2025 13:37:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40246402A0; Tue, 18 Feb 2025 13:37:18 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2077.outbound.protection.outlook.com [40.107.243.77]) by mails.dpdk.org (Postfix) with ESMTP id DEF4F402A0 for ; Tue, 18 Feb 2025 13:37:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nYWbdhhVVrq7J91WWJulLTNM0R1MA+W/ueTyt8hgoSedQvZlt3UkiFGHL3Uv1wcf2UBmtv+ZFBY8HFloN8RYc3af31GxEHFdBOP+SBo5gW5rMHO+9ahlRX73gudysoXKE71yRqMx8zC+WdIkUWWs3186zNwdYkexkUap58+BWI8aYCuTP5ffk776tLGbHxglRGBS7siL4gOIENpbu98QS5E2qWvdFeaTSOkOYt9aE82vuuzU04oirHUIUXf0KsTUvLR6/Kkmj7wUPiN/9xXRByWqTWIDLv4sUjuYJ3bRmdO5wgEf+F/bFXeq6QrimGggMt0HAW+pOrdSXUaCCPcQ1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=7AH+J3yNJS0DsBXvQ9M53huYrnQ+fT8Lf4pP/QPP3TM=; b=UjAXo+Irx5XFiLrclawNkLFF6UISP+X0F5DqaCCL+4VxsMJad5osaKVtnstsrDSp/M+d2EBoc4iRlQVvT4dlxReXCdAZ3n71sL3KzX4LSof2KmW2CfLL2DtsVqDLv9tuONfPzX1EYPKPf8VDsEBlThPJ5tU7BwuY8d532sog2CQqQqdG+bBxPW3OCJ1exMEBnwFofcUxpTgumCBcusChOvJHn1NYJ0oxb28c8pA9u0XrgXe6K9Y/9nY1AazKhKrW0uDOcSzK2ozMoZ6nykgBF4v6EPgJKPnh0XZVwVa8fV4c3t9HQFug9WSelgkIhQpb5sIjLKB+L+8kcrISaV9aPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 (0) 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=7AH+J3yNJS0DsBXvQ9M53huYrnQ+fT8Lf4pP/QPP3TM=; b=eQwFyvdotUHx0ndQSfXtFDoFwtv4xv1XryBJejooDaqPR1ti6RD7m2vocYdD1ICyNg0YiOlKM2OvdTiKLU1n9BWvbqmToY1HZjV4+WhlbGDm0MI2x/055ZhA8WguJCXRN6H8v7+yTtLvrg9szQ0cSmymUtxcPCBIPABiGV/ZmxJHj/LfJIH2QxTqZyP/hCoPCQO5D4VckSgUGLdLQVl/gHQ1Ue+iDZMIndA/NPsSSQp6KRBXqvYhecCn9kyQ4OLqGbBn0bApMRnKxbiWVtD55JY+2eNo4nK/Dgbo9i8GEdVkTYudN58Yfld5vm5AHNQn9y4fBdF9+keoYAhetBMZcA== Received: from BN7PR06CA0055.namprd06.prod.outlook.com (2603:10b6:408:34::32) by CY5PR12MB6348.namprd12.prod.outlook.com (2603:10b6:930:f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.11; Tue, 18 Feb 2025 12:37:12 +0000 Received: from BN3PEPF0000B070.namprd21.prod.outlook.com (2603:10b6:408:34:cafe::77) by BN7PR06CA0055.outlook.office365.com (2603:10b6:408:34::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Tue, 18 Feb 2025 12:37:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN3PEPF0000B070.mail.protection.outlook.com (10.167.243.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:37:10 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:36:55 -0800 Received: from nvidia.com (10.126.230.35) 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.1544.14; Tue, 18 Feb 2025 04:36:53 -0800 From: Xueming Li To: Jie Hai CC: , dpdk stable Subject: patch 'net/hns3: rename RAS module' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:08 +0800 Message-ID: <20250218123523.36836-14-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B070:EE_|CY5PR12MB6348:EE_ X-MS-Office365-Filtering-Correlation-Id: dbda6819-3269-4452-c855-08dd5018f70b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6M6EIqOeINKnNWTMeyu+v7PtXX2J+eI6/RYKGP6GPxxPv8X5NFA/qbJGOkZ7?= =?us-ascii?Q?IXK8ixdhpM1OWlevVIhpZfyPrdGWsPl1J1SD+N23lxJ+xo5Uuqb9wDcfaAS2?= =?us-ascii?Q?pgUwZv0YHCbUojwGUOyh4vR+pXrCoq4li/EaXRzBlKMNPRvGke2wFEK+yMOs?= =?us-ascii?Q?eSOxlHfq0As32vSc9xJ+40SYxEQ6EWw7zLd5WjBllu6DwShMYnxiOrUzlaQT?= =?us-ascii?Q?+6TQqDTQ4SUhqhyplCrCrASeDrfAgWPXkqcu9k7H64FFr3xJgODMsOyaKxmL?= =?us-ascii?Q?rqCWPeeeNlMBM9315RLvFckMMmXVWwENG2HYNFAaaIPjannSW6qIxrSDUMnB?= =?us-ascii?Q?qV038lnAJlErhEgzKBhaWNyjlPxNOS/8CWjogKNgEVSNiU4cQNKN+vomYzEe?= =?us-ascii?Q?fH4Fg5eDIcwVO1yn4zACuWT9URHSvf58XEpWlx/GqZrSoYEZJrcWEHcNqGLb?= =?us-ascii?Q?GM3vVNyRJ44flIFa+HcvGvRNeIePwbrNmCYospyPIE0+IYVxOYC61lNESoLB?= =?us-ascii?Q?cwLBj+AkExrItOifB3B2RNh+nXImTT7AtmvSV/K3vNY3IF0wX1vB1djrcSew?= =?us-ascii?Q?aDHLHfFnTpjg599KEkehGrwJpHIKi3/3KLNaV9uYaUSTox6uA3zm6Klmdmbo?= =?us-ascii?Q?UDjb8M4RwJPVE7t2ZDYSJPLbgsO2lCjDdNNSltZusV+gDtMYmF4VAPaj4gc3?= =?us-ascii?Q?0zwcnjGMcFGfPMCMTFUu4JA7SlsFvIFjWn7p2fgyrGi+hEb0MJoCmXQhcorl?= =?us-ascii?Q?WPplw/aI8N/Vi6H6y13h1/b9bIPma7L0ZHO5EvjIkgpqiJ476gZnf7qSxKG9?= =?us-ascii?Q?Qy2EoH6EhLUlcPzc/SgEY30tnRvCZyJoS8H6huLPn0JLMZ/LqNQGEmYbGjpU?= =?us-ascii?Q?9YqzXLFqmRzPc7X3sWutXlHegDLr8bE50sq8dvU4RW8mKz/yUs1eZri0HW2q?= =?us-ascii?Q?fyyE1cZ99ltLy7yroHTlM6gJLJvPhHOrbtkmI4E/KFos/IbsuaBNBcAbhXj3?= =?us-ascii?Q?c00OLW0OwCMd1a8PWLlh9kXlMo76VgE1OXe9eBjnQOmDAtDo8sNYjWKdKAQJ?= =?us-ascii?Q?jeIQwT5i84u30W5Rp4btM/dZJ/0OFFRKMicdWC9Fmvk6WDToCw53TSfySkXN?= =?us-ascii?Q?lui8daStvIkK8/2xNGfUFQmrTwBp//xMu+Zz9R8vBnxonGLUN6HjdW4vTwZc?= =?us-ascii?Q?WOobj0RurLPW/WRcCGWjrgVyvB1UX4+6iuTFC+/JdmZJIRvzIad8ve9jbUVd?= =?us-ascii?Q?LypupB2A2NBUQUtVWxDWV5/XVylfimOpbajEaEkLJ/P1sXfCwmxo06BTms98?= =?us-ascii?Q?QqjyqGO9HrKF1qDpv+GLvIfj/bLuF8xesQEYD9FfPZcMfzkSLicMa7FvMMcn?= =?us-ascii?Q?2PkmMxF6htaKIkOwUBu2u8GjLUGwH9R20NmwiaseiIz5iah9EJm1P1Qtqkeg?= =?us-ascii?Q?haNk+pDcjGUx2plfg0n+UpgMxlhuV5cgbydPcnr56jbTGTsac0pL9ravwqQD?= =?us-ascii?Q?xBoS/sLx98SRqoI=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:37:10.8628 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dbda6819-3269-4452-c855-08dd5018f70b 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B070.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6348 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=edb45840ef5e2a41ad99918790a8bfeb3f911d95 Thanks. Xueming Li --- >From edb45840ef5e2a41ad99918790a8bfeb3f911d95 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Mon, 30 Dec 2024 14:54:05 +0800 Subject: [PATCH] net/hns3: rename RAS module Cc: Xueming Li [ upstream commit 501a40ae8370dcbfe086ef080a60c86a8d428ef6 ] Rename ROH_MAC module as HIMAC to avoid misunderstandings. Fixes: 1c1eb759e9d7 ("net/hns3: support RAS process in Kunpeng 930") Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_intr.c | 4 ++-- drivers/net/hns3/hns3_intr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c index 3f6b9e7fc4..cef0f23f80 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -1432,8 +1432,8 @@ static const struct hns3_hw_mod_name hns3_hw_module_name[] = { .module_name = MODULE_MASTER, .msg = "MODULE_MASTER" }, { - .module_name = MODULE_ROH_MAC, - .msg = "MODULE_ROH_MAC" + .module_name = MODULE_HIMAC, + .msg = "MODULE_HIMAC" } }; diff --git a/drivers/net/hns3/hns3_intr.h b/drivers/net/hns3/hns3_intr.h index aca1c0722c..fcfb9004cb 100644 --- a/drivers/net/hns3/hns3_intr.h +++ b/drivers/net/hns3/hns3_intr.h @@ -104,7 +104,7 @@ enum hns3_mod_name_list { MODULE_RCB_TX, MODULE_TXDMA, MODULE_MASTER, - MODULE_ROH_MAC, + MODULE_HIMAC, }; enum hns3_err_type_list { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.220146946 +0800 +++ 0013-net-hns3-rename-RAS-module.patch 2025-02-18 19:39:00.438244080 +0800 @@ -1 +1 @@ -From 501a40ae8370dcbfe086ef080a60c86a8d428ef6 Mon Sep 17 00:00:00 2001 +From edb45840ef5e2a41ad99918790a8bfeb3f911d95 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 501a40ae8370dcbfe086ef080a60c86a8d428ef6 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 2de2b86b02..db5c84061c 100644 +index 3f6b9e7fc4..cef0f23f80 100644 @@ -33 +35 @@ -index 1edb07de36..e88b00c9c9 100644 +index aca1c0722c..fcfb9004cb 100644