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 7526342D46 for ; Sun, 25 Jun 2023 08:41:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F6B540ED8; Sun, 25 Jun 2023 08:41:13 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2047.outbound.protection.outlook.com [40.107.92.47]) by mails.dpdk.org (Postfix) with ESMTP id 3AC6B40A7F for ; Sun, 25 Jun 2023 08:41:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K/RutqkPp/d29RpLAa4/Zitk/UmZ/2peiaenjr+4JlUFjWqpB2XrP7NmxxDGYB3irmNFKpCBnlVIMkTBySbBkmyQsK0HJuYEve1scLiyCHs/o4qXXeqBSTqS83VwKEmepVI0+E3lK0HmE5P9gOZtsGdjM8oIFO1fLCNM2C9C8Tmri0X9c6aYF5CdBKvHE5IULQPi6CnABWJmEW41Ha34dtvFx/me7htttrZ6dfs4DwTdXk9SXqkJdael7S8Nm3+ETzp8k32Ipfgw4wyhVvsrkhmfKQC3EnnaKBcmv4LaBbEVze2leEpPbfjY9R7ngkjBCTjOeNtZTJaCenpyaQGT+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=GjBZ1wd0mIR4+/vOo462Z3dXnbmfZNZk10eZjSQ/jbQ=; b=m32YO5xV46GnArVtZlZdpw5+lniXlpwX7sf8ZXVqdfaCPqo2m+iN338rVOp00ymbM0VbpskhdXd9VkRvQbMXa2ZdAXAxIW43T6uqMtwjyYeRhsPf+kl7seGzG9BVx5puTHxobOuBdXab6z9GSk37y7mwwHP7VMQJxTP2KjYxR0SRMLQbWfW8FFfeMaE3k2N7SBIzkvF0nkasSnoiDkqCMg9/ghPCyM+lsTSdVdVjQ294uJuWFo+baoTF6OOVVOf8Sh+/opY16uBF5XQFjmtSLnXzuWptngJBQ7OfLh9lFoeV7R0Z4R9L6NmnzzVoaiJuElkYMIMaQE7e2bWJw0kQTQ== 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 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=GjBZ1wd0mIR4+/vOo462Z3dXnbmfZNZk10eZjSQ/jbQ=; b=C2HiXd+19BBn9uNe7hxwvib0UyvaU2TkszkakTWXDINhKuq11FRgvlXScG6H6RdVueFpsopXduAk5KDk5vMQ07zsLv2maUV1TwjUoj4886fuDEQtNBYxfNxkn8+rZedJjtq7lt57bEIJGCgHJnbBCAr+36V+4efvzZc4eEKV195V+xaxb389UzTrtX4jM9RkGfJFgcLJAGwxGWZD/lQTp5DBUofq7wfgID68AaPoGD3qGrIuF1pI6p00Hs6QdJYjwjBW7Z/21J2wuoz57Al5nyp/l5RsjGU83ll5N0l6GZrL0mfU7DCr5omXpHD8H+y63WU4TGJwcDIDOYwS/O8BVQ== Received: from BY3PR05CA0032.namprd05.prod.outlook.com (2603:10b6:a03:39b::7) by CH3PR12MB8877.namprd12.prod.outlook.com (2603:10b6:610:170::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:41:08 +0000 Received: from CO1NAM11FT103.eop-nam11.prod.protection.outlook.com (2603:10b6:a03:39b:cafe::99) by BY3PR05CA0032.outlook.office365.com (2603:10b6:a03:39b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.14 via Frontend Transport; Sun, 25 Jun 2023 06:41:07 +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 CO1NAM11FT103.mail.protection.outlook.com (10.13.174.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.46 via Frontend Transport; Sun, 25 Jun 2023 06:41:05 +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.986.5; Sat, 24 Jun 2023 23:40:52 -0700 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.986.37; Sat, 24 Jun 2023 23:40:51 -0700 From: Xueming Li To: Dengdui Huang CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix redundant line break in log' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:35 +0800 Message-ID: <20230625063544.11183-58-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT103:EE_|CH3PR12MB8877:EE_ X-MS-Office365-Filtering-Correlation-Id: c75ae37a-ed6a-4c16-04a2-08db754726f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ut2013IEZujjTq+/8GDjhzWs8gC3v03c1+q2iC5dLXSGGU8a9UtVmU42JDj3Y/YH1NfZP5bJ9M/NEjEVBFF77d72XHDcyargC9oOh9k1iuILQt3MvOUn3BEABBbYw9SWXrx2RAfgB1Ig5ktYq9Thd7F02QsqXsJ0hG7fNFUdpZGR9aeNYOMVZXt+IxKdIVq67wycp1maxEOg84yL8QnzcerMnpsZq5WwrqQfDOjPoaV5x7iT/rXAgSHOs6Amhb2NpUcgTmE/Jmn19sX+5xJq+jhYOUbm5ygLZkA0B1dLdxbqjLcwyA9awoMhaTPNE0uoe70KF4VULzzaJg+NkaY3OTM/ke/eCG/6Ku0d9ZqOlSj7yazmlyh/S1dc4nD/dBXRm6QoGKuDdtqwsT+B8Mjxz714qxceymRI7lW6RfyG0LJjjFWM1BrZzXYjWDjXuNqZm3nyWoxUmoX8rdRwRH2EfYg+lVR5SrFdXtCxaY6CWdOkl1NbUgu1OSMlPH8f9gXVNrYJgdTxHOg0Eu2wWOWYQ1KQlv8lOqUNqFPIXAe+RsXR8Hs624WtCxjjraSBdVASWnL9C5vhfquqw6hszls547LW3hRfenBdBApdKKfXVl6PiuutDK/r479GOQA8UJgEe4SvdyClNHo6blfc/OEVZDn78kglPmO6CmkYbcoF+REoykg19ACWH4aYH2N6WHlYTCn523PCqJvEKmWUMGWE+j4tkYs3WD/lZNjfhr6T+H2qJYqyrCHa1sahrb7cHasnbw42Z9wMhv2pZKTCe3KWPQ== 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:(13230028)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199021)(46966006)(36840700001)(40470700004)(40460700003)(2906002)(7696005)(82310400005)(82740400003)(6666004)(356005)(7636003)(2616005)(83380400001)(47076005)(336012)(426003)(1076003)(26005)(186003)(6286002)(16526019)(53546011)(966005)(36860700001)(55016003)(40480700001)(41300700001)(54906003)(86362001)(478600001)(316002)(36756003)(70586007)(70206006)(4326008)(6916009)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:41:05.8355 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c75ae37a-ed6a-4c16-04a2-08db754726f0 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: CO1NAM11FT103.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8877 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.3 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/27/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=219305d22720dfc04bd8c363d9c6503e752eade8 Thanks. Xueming Li --- >From 219305d22720dfc04bd8c363d9c6503e752eade8 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 Cc: Xueming Li [ 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 | 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 6cf1dbc27c..d4ea9daddc 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -3635,7 +3635,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; } @@ -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; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.041831200 +0800 +++ 0057-net-hns3-fix-redundant-line-break-in-log.patch 2023-06-25 14:31:58.395773900 +0800 @@ -1 +1 @@ -From 0b5e15ea5f8841e43c63350e47cbfddbb92dc25c Mon Sep 17 00:00:00 2001 +From 219305d22720dfc04bd8c363d9c6503e752eade8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0b5e15ea5f8841e43c63350e47cbfddbb92dc25c ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 64028778d0..dccd1d416f 100644 +index 6cf1dbc27c..d4ea9daddc 100644 @@ -22 +24 @@ -@@ -3631,7 +3631,7 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code) +@@ -3635,7 +3635,7 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code)