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 F2727A0557 for ; Wed, 16 Nov 2022 11:41:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFD6942D1F; Wed, 16 Nov 2022 11:41:00 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 1CEB840E03 for ; Wed, 16 Nov 2022 11:40:58 +0100 (CET) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 12E973F118 for ; Wed, 16 Nov 2022 10:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668595257; bh=H7HkOEZ4+tceIFIGMnO+M1DEd6Vtny34wKxRJwM0BMI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GTSIbasiuA5KzKgaCwAXz+TeN9zHZ6sZ5JMO2FGOWGdV/Cb4MrIiUX5KivkMhbcYh 4JAx33GtkiOBmUDODUWZZuUK0dVJoknh5wN5ZGZhYfhtURf311tY/KoMJtXPDE3o3W IUSM3cWdu9ajWpuddAV45/U+zp5ZwMo/MAy56bFNf0qbUDfNnra5IfHWx9/w0KPzjV AI1gd0FWKSrdAXdRUhCMjKl7b8D6QJnaDHk18wQZFlzxoE+5hbSq6xL5mW3qyi4lNx K0L/Qyq/KGAeK/1kmbde6e6NHWlQ3HQiEVjG+fn0s4cYa/qkJD+Kx3N/DzDZITc4+I arUGjfwXpZkcw== Received: by mail-wr1-f70.google.com with SMTP id h26-20020adfaa9a000000b002364ad63bbcso3576440wrc.10 for ; Wed, 16 Nov 2022 02:40:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=H7HkOEZ4+tceIFIGMnO+M1DEd6Vtny34wKxRJwM0BMI=; b=mvWFe6rxBTp96Q2DqS/xaTXPf3fJxvMY6xmOp1434+NT4olkXtb+ghtnnK9041E3jF aMzwZPvKEUxfMsD034wbkaQMIf8aWKn+JUPQLxkNaos0POE6O0GPnknA+8UhOEMWsums HAfzNqgfgouOfK/VvjlwyrT+IE251X3Oy2UsgQRN4YcNXETpj6WAx8AbTlZHGUDAUP1G s3CHlUrAJPHLdTOp3qvoAGPjuEorg5NUnaYotv0IStXS088tcUEwosQ6ydKMsPv4OszL S0ALA4xL4iEAKXO/iKaNao7fWcpJqS0y/FOidkDuGKJHmiXrEsyQpGfbG0oQIhwLf5A3 juvg== X-Gm-Message-State: ANoB5pkoJI1GHxiyDmBsyWORtngLlwqXdSEEP/U6JOpg+CgdIQzjCuy4 KKfPE0VVC2udxKI6YSnI5TwMDdEiNYt9V1L0eT8w2b70e+3eJLdHk6BM2CIkN4ZwlZKLGEWD4vp 1QvwUF3x/lYHOCnl7CTIVB0ZM X-Received: by 2002:adf:f74f:0:b0:22c:f296:1120 with SMTP id z15-20020adff74f000000b0022cf2961120mr12812019wrp.369.1668595256260; Wed, 16 Nov 2022 02:40:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf6hdIvZ8SgPJKylO8XeIiA8vc190ex8I6boBLzne+NmDc4V0DJEhzRzWTSXSUUKBxP6g4aV9Q== X-Received: by 2002:adf:f74f:0:b0:22c:f296:1120 with SMTP id z15-20020adff74f000000b0022cf2961120mr12812010wrp.369.1668595255992; Wed, 16 Nov 2022 02:40:55 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39e5:dd00:975:f38b:96af:696f]) by smtp.gmail.com with ESMTPSA id s3-20020adfecc3000000b0022e653f5abbsm14719833wro.69.2022.11.16.02.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 02:40:55 -0800 (PST) From: christian.ehrhardt@canonical.com To: Luca Boccassi Cc: dpdk stable Subject: patch 'drivers: fix typos found by Lintian' has been queued to stable release 19.11.14 Date: Wed, 16 Nov 2022 11:40:10 +0100 Message-Id: <20221116104012.2975036-15-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116104012.2975036-1-christian.ehrhardt@canonical.com> References: <20221116104012.2975036-1-christian.ehrhardt@canonical.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 19.11.14 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/23/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/fc4016bb2af627264240d44f9e632aba55286e34 Thanks. Christian Ehrhardt --- >From fc4016bb2af627264240d44f9e632aba55286e34 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 14 Nov 2022 14:21:53 +0000 Subject: [PATCH] drivers: fix typos found by Lintian [ upstream commit bdab5309193d8e1ed1a60b604677c86c322364e0 ] Signed-off-by: Luca Boccassi --- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/qede/base/ecore_int.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 24d9c1b414..a182e4306f 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -198,7 +198,7 @@ bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev, if (slave_info.max_rx_queues < bond_dev->data->nb_rx_queues || slave_info.max_tx_queues < bond_dev->data->nb_tx_queues) { RTE_BOND_LOG(ERR, - "%s: Slave %d capabilities doesn't allow to allocate additional queues", + "%s: Slave %d capabilities doesn't allow allocating additional queues", __func__, slave_port); return -1; } diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 4cf3eb1b47..7e58754249 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -1680,7 +1680,7 @@ err_pause_addr_cfg: rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, mac_addr); hns3_warn(hw, - "Failed to roll back to del setted mac addr(%s): %d", + "Failed to roll back to del set mac addr(%s): %d", mac_str, ret_val); } diff --git a/drivers/net/qede/base/ecore_int.c b/drivers/net/qede/base/ecore_int.c index 2c4aac9418..d9faf6bfcd 100644 --- a/drivers/net/qede/base/ecore_int.c +++ b/drivers/net/qede/base/ecore_int.c @@ -366,7 +366,7 @@ enum _ecore_status_t ecore_pglueb_rbc_attn_handler(struct ecore_hwfn *p_hwfn, tmp = ecore_rd(p_hwfn, p_ptt, PGLUE_B_REG_TX_ERR_WR_DETAILS_ICPL); if (tmp & ECORE_PGLUE_ATTENTION_ICPL_VALID) - DP_NOTICE(p_hwfn, false, "ICPL erorr - %08x\n", tmp); + DP_NOTICE(p_hwfn, false, "ICPL error - %08x\n", tmp); tmp = ecore_rd(p_hwfn, p_ptt, PGLUE_B_REG_MASTER_ZLR_ERR_DETAILS); if (tmp & ECORE_PGLUE_ATTENTION_ZLR_VALID) { @@ -378,7 +378,7 @@ enum _ecore_status_t ecore_pglueb_rbc_attn_handler(struct ecore_hwfn *p_hwfn, PGLUE_B_REG_MASTER_ZLR_ERR_ADD_63_32); DP_NOTICE(p_hwfn, false, - "ICPL erorr - %08x [Address %08x:%08x]\n", + "ICPL error - %08x [Address %08x:%08x]\n", tmp, addr_hi, addr_lo); } -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-16 11:36:50.981555016 +0100 +++ 0015-drivers-fix-typos-found-by-Lintian.patch 2022-11-16 11:36:50.448775675 +0100 @@ -1 +1 @@ -From bdab5309193d8e1ed1a60b604677c86c322364e0 Mon Sep 17 00:00:00 2001 +From fc4016bb2af627264240d44f9e632aba55286e34 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bdab5309193d8e1ed1a60b604677c86c322364e0 ] + @@ -8 +9,0 @@ - drivers/crypto/dpaa_sec/dpaa_sec.c | 4 ++-- @@ -12 +13 @@ - 4 files changed, 6 insertions(+), 6 deletions(-) + 3 files changed, 4 insertions(+), 4 deletions(-) @@ -14,21 +14,0 @@ -diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c -index b1e7027823..db52683847 100644 ---- a/drivers/crypto/dpaa_sec/dpaa_sec.c -+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c -@@ -754,14 +754,14 @@ mbuf_dump: - printf("ctx info:\n"); - printf("job->sg[0] output info:\n"); - memcpy(&sg[0], &job->sg[0], sizeof(sg[0])); -- printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textention = %d" -+ printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension = %d" - "\n\tbpid = %d\n\toffset = %d\n", - (uint64_t)sg[0].addr, sg[0].length, sg[0].final, - sg[0].extension, sg[0].bpid, sg[0].offset); - printf("\njob->sg[1] input info:\n"); - memcpy(&sg[1], &job->sg[1], sizeof(sg[1])); - hw_sg_to_cpu(&sg[1]); -- printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textention = %d" -+ printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension = %d" - "\n\tbpid = %d\n\toffset = %d\n", - (uint64_t)sg[1].addr, sg[1].length, sg[1].final, - sg[1].extension, sg[1].bpid, sg[1].offset); @@ -36 +16 @@ -index 2efaad1e8e..b9bcebc6cb 100644 +index 24d9c1b414..a182e4306f 100644 @@ -49 +29 @@ -index b4365b78be..d326f70129 100644 +index 4cf3eb1b47..7e58754249 100644 @@ -52,3 +32,3 @@ -@@ -1661,7 +1661,7 @@ err_pause_addr_cfg: - hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, - mac_addr); +@@ -1680,7 +1680,7 @@ err_pause_addr_cfg: + rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, + mac_addr);