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 9E7ED46211 for ; Thu, 13 Feb 2025 11:00:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C0F642ED5; Thu, 13 Feb 2025 11:00:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 8A38042EC3 for ; Thu, 13 Feb 2025 11:00:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PUrpokSGg8YJoDM+Z8V/8hR1lVuIGeeUqlsUMZEkE9g=; b=X/Xfm6C8SMBsAWEkxdtGSKx48OWOxFUc9rBVyhzfaSvtXzqYrkSHDk0HGjLYf76okzxLiP v5Od1kjf/VMpuWrqXgLI0gA+zMdN/TMt4/2AT29iejKOfi8N4Vmb+xZoK8UURMIy0E9n3P b9aMSXO0xo81z0+D5bv3rQ+5jatjaf4= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-ifiQ0c4DOBaKImrzdnE9ug-1; Thu, 13 Feb 2025 05:00:25 -0500 X-MC-Unique: ifiQ0c4DOBaKImrzdnE9ug-1 X-Mimecast-MFC-AGG-ID: ifiQ0c4DOBaKImrzdnE9ug Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7D4B819783BF; Thu, 13 Feb 2025 10:00:24 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 451161800360; Thu, 13 Feb 2025 10:00:22 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: dpdk stable Subject: patch 'net/hns3: rename RAS module' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:57:44 +0000 Message-ID: <20250213095933.362078-17-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: woGDXiKBWwDgFRkLJlSN8aG4kSWPThhTAaQAGcaEYMI_1739440824 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/25. 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/5ad1682931f0dc458eb4469d2ba720c5d1363e1b Thanks. Kevin --- >From 5ad1682931f0dc458eb4469d2ba720c5d1363e1b 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 [ 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 2de2b86b02..db5c84061c 100644 --- a/drivers/net/hns3/hns3_intr.c +++ b/drivers/net/hns3/hns3_intr.c @@ -1433,6 +1433,6 @@ static const struct hns3_hw_mod_name hns3_hw_module_name[] = { .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 1edb07de36..e88b00c9c9 100644 --- a/drivers/net/hns3/hns3_intr.h +++ b/drivers/net/hns3/hns3_intr.h @@ -105,5 +105,5 @@ enum hns3_mod_name_list { MODULE_TXDMA, MODULE_MASTER, - MODULE_ROH_MAC, + MODULE_HIMAC, }; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:36.424086580 +0000 +++ 0017-net-hns3-rename-RAS-module.patch 2025-02-12 17:29:34.183944933 +0000 @@ -1 +1 @@ -From 501a40ae8370dcbfe086ef080a60c86a8d428ef6 Mon Sep 17 00:00:00 2001 +From 5ad1682931f0dc458eb4469d2ba720c5d1363e1b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 501a40ae8370dcbfe086ef080a60c86a8d428ef6 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org