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 2182342CBC for ; Thu, 15 Jun 2023 03:34:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BA5F40E0F; Thu, 15 Jun 2023 03:34:59 +0200 (CEST) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by mails.dpdk.org (Postfix) with ESMTP id 3A84742D48 for ; Thu, 15 Jun 2023 03:34:57 +0200 (CEST) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-4f640e48bc3so9544210e87.2 for ; Wed, 14 Jun 2023 18:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792897; x=1689384897; 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=AzcDo5a/94Ue7DygWr6u31bQOAbnYcgHr0S1Sz8xQto=; b=mgvh8o0DD+KlM9twI3yG0f4MSk/hey/LZIdkWGrrSxAjOc5h/iGUks6StDJCKyg35E /VgieyXFlyIor6krMb1h21JShbGMm/PdHfmGeI1+zpQy5h9pSSmaxMjdx91HPdG6O0NE gN5o0NH/h7KD+zwGUsbpon5msxbIWEzo2EhnWfqdVEL/4ku7XmL094ebbFeBdKcNheD0 +K6izZTS7ZoLnsVolMI0HO1HTRYjtU+RceyQ4I98okSm2TOh4W5TKns+jJsnmFwQ+Tkv TA44nQiz3Y5OtKTSJSLMzMZY7sdlzxnIBkgasx29j6jkA9PYSye6mMFG/y2/2lN8TaEN P1dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792897; x=1689384897; 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=AzcDo5a/94Ue7DygWr6u31bQOAbnYcgHr0S1Sz8xQto=; b=VYbB2T4vPr7AZQf+vE+R3wzPqRNK28eoLr8H9d1dyne6x/55aUlSJ1IWxp+twF0zwl uGOVgS4cWKBX8WtEpIXMRMRdNV4dsOHY9/zd5qsGjpTSJhgNG9YJYH8sQ7rXPzc9mKn7 Qk2+Cw7BsxtdmfCJtnSqecmX6voMkki2+ixLCCzgwM7zF3FcCFxUPvZBlRuvUs30EarW HSrQPsk2RzPkaNsGTur2d5Q6gSNaHoGS75LotgLhHxkM0SumnmBnybSkf+lA7hJ/PFb2 xtnU8D6StRpzYOehOMUULYAnvJLhO/2Rw90jk+mDFJJQ1NNTvCd3FAxEFaOCxMVhQKiH tlgg== X-Gm-Message-State: AC+VfDxilyeshsR3FCS2jYVpq3nScpA4K+oRz1dlxYe+NOLW4T+869be F6fV6EUtiklYmQ3a5x15rdswQDdmsd6up7Dv X-Google-Smtp-Source: ACHHUZ7XRRVMefXhWfeCdiQNxYzl4uxelqp2Ev+zvl7NGOOy5NWi0DzdhSFT+4BJUZfD18iFOUJ0og== X-Received: by 2002:a19:5003:0:b0:4f7:4f30:1532 with SMTP id e3-20020a195003000000b004f74f301532mr4977116lfb.31.1686792896696; Wed, 14 Jun 2023 18:34:56 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id p19-20020a05600c469300b003f7f475c3bcsm1124353wmo.1.2023.06.14.18.34.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:34:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix redundant line break in log' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:32 +0100 Message-Id: <20230615013258.1439718-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f839abd1207c496ffba606b3763dced1ce07187f Thanks. Luca Boccassi --- >From f839abd1207c496ffba606b3763dced1ce07187f Mon Sep 17 00:00:00 2001 From: Dengdui Huang 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 Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 5d685b17f4..552280f35d 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4088,7 +4088,7 @@ 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; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:36.629128980 +0100 +++ 0037-net-hns3-fix-redundant-line-break-in-log.patch 2023-06-15 01:56:34.627542615 +0100 @@ -1 +1 @@ -From 0b5e15ea5f8841e43c63350e47cbfddbb92dc25c Mon Sep 17 00:00:00 2001 +From f839abd1207c496ffba606b3763dced1ce07187f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0b5e15ea5f8841e43c63350e47cbfddbb92dc25c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - drivers/net/hns3/hns3_ethdev.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + drivers/net/hns3/hns3_ethdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) @@ -19 +20 @@ -index 64028778d0..dccd1d416f 100644 +index 5d685b17f4..552280f35d 100644 @@ -22 +23 @@ -@@ -3631,7 +3631,7 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code) +@@ -4088,7 +4088,7 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code) @@ -30,36 +30,0 @@ - } -@@ -6235,7 +6235,7 @@ hns3_optical_module_existed(struct hns3_hw *hw) - ret = hns3_cmd_send(hw, &desc, 1); - 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; - } -@@ -6273,7 +6273,7 @@ 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; - } -@@ -6310,7 +6310,7 @@ hns3_get_module_eeprom(struct rte_eth_dev *dev, - return -ENOTSUP; - - 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; - } - -@@ -6373,7 +6373,7 @@ hns3_get_module_info(struct rte_eth_dev *dev, - modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8636_MAX_LEN; - 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;