patch 'net/hns3: fix redundant line break in log' has been queued to stable release 21.11.5

Kevin Traynor ktraynor at redhat.com
Thu Jul 20 17:17:58 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/b99c14584b5f8ee174f2619fb1c8ce344b174966

Thanks.

Kevin

---
>From b99c14584b5f8ee174f2619fb1c8ce344b174966 Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui at huawei.com>
Date: Fri, 2 Jun 2023 19:42:05 +0800
Subject: [PATCH] net/hns3: fix redundant line break in log

[ upstream commit 0b5e15ea5f8841e43c63350e47cbfddbb92dc25c ]

This patch remove log redundant line break

Fixes: d51867db65c1 ("net/hns3: add initialization")
Fixes: c6332c3cf9f0 ("net/hns3: support module EEPROM dump")

Signed-off-by: Dengdui Huang <huangdengdui at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index f61509a281..250973e230 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -3654,5 +3654,5 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code)
 	if (cmdq_resp) {
 		PMD_INIT_LOG(ERR,
-			     "cmdq execute failed for get_mac_ethertype_cmd_status, status=%u.\n",
+			     "cmdq execute failed for get_mac_ethertype_cmd_status, status=%u.",
 			     cmdq_resp);
 		return -EIO;
@@ -6301,5 +6301,5 @@ hns3_optical_module_existed(struct hns3_hw *hw)
 	if (ret) {
 		hns3_err(hw,
-			 "fail to get optical module exist state, ret = %d.\n",
+			 "fail to get optical module exist state, ret = %d.",
 			 ret);
 		return false;
@@ -6339,5 +6339,5 @@ hns3_get_module_eeprom_data(struct hns3_hw *hw, uint32_t offset,
 	ret = hns3_cmd_send(hw, desc, HNS3_SFP_INFO_CMD_NUM);
 	if (ret) {
-		hns3_err(hw, "fail to get module EEPROM info, ret = %d.\n",
+		hns3_err(hw, "fail to get module EEPROM info, ret = %d.",
 				ret);
 		return ret;
@@ -6376,5 +6376,5 @@ hns3_get_module_eeprom(struct rte_eth_dev *dev,
 
 	if (!hns3_optical_module_existed(hw)) {
-		hns3_err(hw, "fail to read module EEPROM: no module is connected.\n");
+		hns3_err(hw, "fail to read module EEPROM: no module is connected.");
 		return -EIO;
 	}
@@ -6439,5 +6439,5 @@ hns3_get_module_info(struct rte_eth_dev *dev,
 		break;
 	default:
-		hns3_err(hw, "unknown module, type = %u, extra_type = %u.\n",
+		hns3_err(hw, "unknown module, type = %u, extra_type = %u.",
 			 sfp_type.type, sfp_type.ext_type);
 		return -EINVAL;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:00.684291912 +0100
+++ 0047-net-hns3-fix-redundant-line-break-in-log.patch	2023-07-20 16:17:54.699750663 +0100
@@ -1 +1 @@
-From 0b5e15ea5f8841e43c63350e47cbfddbb92dc25c Mon Sep 17 00:00:00 2001
+From b99c14584b5f8ee174f2619fb1c8ce344b174966 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0b5e15ea5f8841e43c63350e47cbfddbb92dc25c ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 64028778d0..dccd1d416f 100644
+index f61509a281..250973e230 100644
@@ -22 +23 @@
-@@ -3632,5 +3632,5 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code)
+@@ -3654,5 +3654,5 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code)
@@ -29 +30 @@
-@@ -6236,5 +6236,5 @@ hns3_optical_module_existed(struct hns3_hw *hw)
+@@ -6301,5 +6301,5 @@ hns3_optical_module_existed(struct hns3_hw *hw)
@@ -36 +37 @@
-@@ -6274,5 +6274,5 @@ hns3_get_module_eeprom_data(struct hns3_hw *hw, uint32_t offset,
+@@ -6339,5 +6339,5 @@ hns3_get_module_eeprom_data(struct hns3_hw *hw, uint32_t offset,
@@ -43 +44 @@
-@@ -6311,5 +6311,5 @@ hns3_get_module_eeprom(struct rte_eth_dev *dev,
+@@ -6376,5 +6376,5 @@ hns3_get_module_eeprom(struct rte_eth_dev *dev,
@@ -50 +51 @@
-@@ -6374,5 +6374,5 @@ hns3_get_module_info(struct rte_eth_dev *dev,
+@@ -6439,5 +6439,5 @@ hns3_get_module_info(struct rte_eth_dev *dev,



More information about the stable mailing list