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 897E74624E for ; Mon, 17 Feb 2025 18:05:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 84B09402CC; Mon, 17 Feb 2025 18:05:21 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 0F146400D6 for ; Mon, 17 Feb 2025 18:05:21 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-38f403edb4eso719338f8f.3 for ; Mon, 17 Feb 2025 09:05:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739811921; x=1740416721; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Mpp4vUU+8zk5VGsQ8t9X4vQrdI0yCd9Uj7Nj3EVwqD4=; b=aqn/ecjbusn1i7MlCL3COb6LyFhwv6fe7ePxtarbDKe6NOPTitkjBdyg7ei0DqgCM4 SK7yV+nLWFNmFhYLYAWmm0N3RWaXzeWLo3BBlZWtBXTbiXJjQatyfcjOi0h5LzVkAkTc Yoshp7OrrgyKJxDinc08GxCpfRYh9TrN9wkaS2TN0IDhD9Yw5OnP2beIP2wonephB19Y llFOoOm1auoONzETCrksaQ4K7cEto+p3XBU0X/U2RM79yJ0evAty3cQ52fCO6t4zeR7J yC0/XMQC2fSN1vzxK8o0HNfBtLXVFcsnL36vhw2RZMyNuLjHr+EdbvWFdsbQ43NjLKm+ aoww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739811921; x=1740416721; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mpp4vUU+8zk5VGsQ8t9X4vQrdI0yCd9Uj7Nj3EVwqD4=; b=sCMjTINEzgjcgUYonJ3ZKcvesrm7uc+ajgBrhDXNbAyzyfyDpfu+R+AUSDy20yuaNq MoqZ0GHnHkKN+gmaIxKRtsrrx9Nlg0QNURG3LIVHgylzAgm1DpXUgFEPrKCmpVfqLfP6 fJN+/6UNfwK+9/IHhV4nN9FTBV0Hzg7Rf7NWf0I6WqLBj3ABIQgxLXhRURL98YM6IKrT fl/eSnTh/SS1tXTNcGtQQz1PFtveXdMK7t8Jw0EGDBXj0d756jLurGoEgEHs0LXvZffF xuAKBfP8Jyk6iHSLU/mGnwmAsJjko+mEAVpqYL983FlYzQ1H3Rf9VFza7eh3IG9JoFTJ arkQ== X-Gm-Message-State: AOJu0YxlM/qyPNFea9AjLx8J/lPk5Lvi/geUtb0ZS4QLuWqFYUTH4iva kbnrevJ+tXMDzxtWAFoKScWPgqr8VKkxCkAAvgmv399BXYehoqXdHtMQnQ2tLuY= X-Gm-Gg: ASbGncvJiT9HcL5OquJUcu4I0jJNoDv3PdS4N9VZZF8MF1U19tmXGLk4ciqb9i8MOQd 8JAkCWlJMVVlYXHfb/uH8Nrm//4w1WDGgZuUnIHMt0wUka1mq4IV3GIIJlsDJM/AuLQEcPJxYkz kh+v9qmYNrh+cTJio6yG5A56BiAIcwzQLoiFDm9n2uC42179NFavDbIopfyqyLwEJPEt9vVtteu B0iEjDok+pFhwio+YC7a/pQqe/k7yFcHqNtJvcrwEARCy1S7pNyYdlv0haAlhnAYmt7KAopslpc kwQdtKU0sGWiUlektRJw3Q== X-Google-Smtp-Source: AGHT+IFJf3SLzKiKh4mD0OP7Jpgnl8/mhw9XhJpD7/bWwAcNUjvhtn4ErbDDBanOEjzwkbBbH4FpRg== X-Received: by 2002:a5d:638a:0:b0:38d:dfdc:52a2 with SMTP id ffacd0b85a97d-38f33f531e1mr8770751f8f.40.1739811920369; Mon, 17 Feb 2025 09:05:20 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f25914171sm12931406f8f.53.2025.02.17.09.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:05:20 -0800 (PST) From: luca.boccassi@gmail.com To: Jie Hai Cc: dpdk stable Subject: patch 'net/hns3: rename RAS module' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:03:43 +0000 Message-ID: <20250217170456.1068278-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 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/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3c915efd369d17f8868d8933756cb4b7626be8ac Thanks. Luca Boccassi --- >From 3c915efd369d17f8868d8933756cb4b7626be8ac 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 d37c7eba6b..260cfcee7c 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:17.250587101 +0000 +++ 0010-net-hns3-rename-RAS-module.patch 2025-02-17 16:13:16.790441593 +0000 @@ -1 +1 @@ -From 501a40ae8370dcbfe086ef080a60c86a8d428ef6 Mon Sep 17 00:00:00 2001 +From 3c915efd369d17f8868d8933756cb4b7626be8ac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 501a40ae8370dcbfe086ef080a60c86a8d428ef6 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 2de2b86b02..db5c84061c 100644 +index d37c7eba6b..260cfcee7c 100644 @@ -33 +34 @@ -index 1edb07de36..e88b00c9c9 100644 +index aca1c0722c..fcfb9004cb 100644