From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 66039A0093 for ; Tue, 19 May 2020 15:12:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5BBEB1D702; Tue, 19 May 2020 15:12:22 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id AE0631D729 for ; Tue, 19 May 2020 15:12:20 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id u1so2229262wmn.3 for ; Tue, 19 May 2020 06:12:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KU+keaPiMmdamlaB4GCyTb19vBqIr/H8q6StkxvB86I=; b=dBn6u7CVP7w9ZFAaWbREqYBs6kROJdCDxKbjHp7nK14G7LBoybaCGv8wl9LWnd8JO2 4H2hH/DAOQDoBvFlEXvKXF1ZFwkPQHAAvn00KUucvWzT6M8Ro/Sz/NCGOJyHGiIwJNeE u7kPepTj5Y/NHn5SkI+lJt4ShNr0JjrLoQbEa/jXhSwwc3h5Sp4c79iYb3J+XhnsZC5u eDmkpcL1HGN9zPoWxSpwX/ROevR87V3b3xp4rcs++i2GKQP6XJF1XsApVHOngQefudrl cua88OePtae8UA6Cd4/T9L4JUvoSdTyxZ0i/CUPJ4N5V2UNtpuNS/KEJkBH+75/2CHTk TCqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KU+keaPiMmdamlaB4GCyTb19vBqIr/H8q6StkxvB86I=; b=FlcZDiDqR6D+yhFGjYHRvZdYprnN96QjVPPRT+WX12b1svtok9JwDKpPmDHphfc25G 8RNlhWKQGiikf0b9RYMeOqGZv9NMzvZKB1ugocS8ocmVPedBNlyAkfK5lp9c8rlJNzyR 4bOhbu3pYX2NMSNfiJL6Qm4RCGnVMOjcdyfW05+2EU7jVh0ECgOotXjJ3iY/7hmiszZJ 4ugLyqi3mMDNs2ofcWc1JDQKkpOM4yhMcQR/mrZNEOMgUxhNDVKdzBRXX8F20qxVrTEd u/U+UxaT5xB0nQ4JZ4cUEZPLFLV1yhyTYJoKZD0AbyOUrAQsyV72EAqvgmg8/RvCgR2W FODA== X-Gm-Message-State: AOAM531cimkMMcrYTWEVsiBHudK0+qJgmOAGxfmvcyI0oDAo9Co6+a5u HKlyfYwt0PgxeKAQc6sxybsuGSqUT0MR5UWI X-Google-Smtp-Source: ABdhPJzSO5Oqoh3tn7p9Nad1npKn+ujIIsNVcbJSfJI4jmjwONyt3I57rdcLY2vc0HhkEGCdwNIyqw== X-Received: by 2002:a05:600c:14d4:: with SMTP id i20mr5436772wmh.74.1589893940361; Tue, 19 May 2020 06:12:20 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z12sm4215922wmc.6.2020.05.19.06.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:12:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: dpdk stable Date: Tue, 19 May 2020 14:04:17 +0100 Message-Id: <20200519130549.112823-122-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'fix various typos found by Lintian' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 05/21/20. 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. Thanks. Luca Boccassi --- >From 0d7e4fbf2d6b4fffc5590bc373b1eb84442a86fb Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 29 Feb 2020 16:37:06 +0000 Subject: [PATCH] fix various typos found by Lintian [ upstream commit 611faa5f46cc67449f272e14450fc6a0a275767d ] Signed-off-by: Luca Boccassi --- app/test-pmd/cmdline.c | 4 ++-- app/test/test_mbuf.c | 2 +- drivers/common/octeontx2/hw/otx2_npc.h | 4 ++-- drivers/compress/octeontx/otx_zip_pmd.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/cxgbe/cxgbe_flow.c | 2 +- drivers/net/dpaa2/dpaa2_flow.c | 4 ++-- drivers/net/dpaa2/dpaa2_mux.c | 2 +- drivers/net/hinic/base/hinic_pmd_mbox.c | 2 +- drivers/net/mlx5/mlx5_rxtx.c | 2 +- drivers/net/pfe/pfe_ethdev.c | 2 +- drivers/net/qede/qede_ethdev.c | 2 +- lib/librte_eal/linux/eal/eal.c | 2 +- lib/librte_ipsec/sa.h | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index d9f5f6f167..1dbde50566 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -94,7 +94,7 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result, " help ports : Configuring ports.\n" " help registers : Reading and setting port registers.\n" " help filters : Filters configuration help.\n" - " help traffic_management : Traffic Management commmands.\n" + " help traffic_management : Traffic Management commands.\n" " help devices : Device related cmds.\n" " help all : All of the above sections.\n\n" ); @@ -5122,7 +5122,7 @@ cmd_gso_size_parsed(void *parsed_result, if (test_done == 0) { printf("Before setting GSO segsz, please first" - " stop fowarding\n"); + " stop forwarding\n"); return; } diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 61ecffc184..f2922e05e0 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -1144,7 +1144,7 @@ test_refcnt_mbuf(void) tref += refcnt_lcore[slave]; if (tref != refcnt_lcore[master]) - rte_panic("refernced mbufs: %u, freed mbufs: %u\n", + rte_panic("referenced mbufs: %u, freed mbufs: %u\n", tref, refcnt_lcore[master]); rte_mempool_dump(stdout, refcnt_pool); diff --git a/drivers/common/octeontx2/hw/otx2_npc.h b/drivers/common/octeontx2/hw/otx2_npc.h index 3dfc137a30..600084ff31 100644 --- a/drivers/common/octeontx2/hw/otx2_npc.h +++ b/drivers/common/octeontx2/hw/otx2_npc.h @@ -213,7 +213,7 @@ enum npc_kpu_lc_ltype { NPC_LT_LC_FCOE, }; -/* Don't modify Ltypes upto SCTP, otherwise it will +/* Don't modify Ltypes up to SCTP, otherwise it will * effect flow tag calculation and thus RSS. */ enum npc_kpu_ld_ltype { @@ -260,7 +260,7 @@ enum npc_kpu_lg_ltype { NPC_LT_LG_TU_ETHER_IN_NSH, }; -/* Don't modify Ltypes upto SCTP, otherwise it will +/* Don't modify Ltypes up to SCTP, otherwise it will * effect flow tag calculation and thus RSS. */ enum npc_kpu_lh_ltype { diff --git a/drivers/compress/octeontx/otx_zip_pmd.c b/drivers/compress/octeontx/otx_zip_pmd.c index 9e00c86630..bff8ef035e 100644 --- a/drivers/compress/octeontx/otx_zip_pmd.c +++ b/drivers/compress/octeontx/otx_zip_pmd.c @@ -406,7 +406,7 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, qp->name = name; - /* Create completion queue upto max_inflight_ops */ + /* Create completion queue up to max_inflight_ops */ qp->processed_pkts = zip_pmd_qp_create_processed_pkts_ring(qp, max_inflight_ops, socket_id); if (qp->processed_pkts == NULL) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index 1833d659d8..2be6e12f66 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -391,7 +391,7 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev, dev_info->max_event_priority_levels = DPAA2_EVENT_MAX_EVENT_PRIORITY_LEVELS; dev_info->max_event_ports = rte_fslmc_get_device_count(DPAA2_IO); - /* we only support dpio upto number of cores*/ + /* we only support dpio up to number of cores */ if (dev_info->max_event_ports > rte_lcore_count()) dev_info->max_event_ports = rte_lcore_count(); dev_info->max_event_port_dequeue_depth = diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index a4cd6cc672..90e65d1a56 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1517,7 +1517,7 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev, } if (hash_types) { PMD_DRV_LOG(ERR, - "Unknwon RSS config from firmware (%08x), RSS disabled", + "Unknown RSS config from firmware (%08x), RSS disabled", vnic->hash_type); return -ENOTSUP; } diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c index 9070f4960d..2fb77b4abb 100644 --- a/drivers/net/cxgbe/cxgbe_flow.c +++ b/drivers/net/cxgbe/cxgbe_flow.c @@ -230,7 +230,7 @@ ch_rte_parsetype_port(const void *dmask, const struct rte_flow_item *item, if (val->index > 0x7) return rte_flow_error_set(e, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, - "port index upto 0x7 is supported"); + "port index up to 0x7 is supported"); CXGBE_FILL_FS(val->index, mask->index, iport); diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c index 2212650320..8aa65db305 100644 --- a/drivers/net/dpaa2/dpaa2_flow.c +++ b/drivers/net/dpaa2/dpaa2_flow.c @@ -1850,13 +1850,13 @@ struct rte_flow *dpaa2_flow_create(struct rte_eth_dev *dev, key_iova = (size_t)rte_malloc(NULL, 256, 64); if (!key_iova) { DPAA2_PMD_ERR( - "Memory allocation failure for rule configration\n"); + "Memory allocation failure for rule configuration\n"); goto mem_failure; } mask_iova = (size_t)rte_malloc(NULL, 256, 64); if (!mask_iova) { DPAA2_PMD_ERR( - "Memory allocation failure for rule configration\n"); + "Memory allocation failure for rule configuration\n"); goto mem_failure; } diff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c index 1910cc4184..af90adb828 100644 --- a/drivers/net/dpaa2/dpaa2_mux.c +++ b/drivers/net/dpaa2/dpaa2_mux.c @@ -84,7 +84,7 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id, (2 * DIST_PARAM_IOVA_SIZE), RTE_CACHE_LINE_SIZE); if (!flow) { DPAA2_PMD_ERR( - "Memory allocation failure for rule configration\n"); + "Memory allocation failure for rule configuration\n"); goto creation_error; } key_iova = (void *)((size_t)flow + sizeof(struct rte_flow)); diff --git a/drivers/net/hinic/base/hinic_pmd_mbox.c b/drivers/net/hinic/base/hinic_pmd_mbox.c index 935d60bc81..cfe91ddbad 100644 --- a/drivers/net/hinic/base/hinic_pmd_mbox.c +++ b/drivers/net/hinic/base/hinic_pmd_mbox.c @@ -870,7 +870,7 @@ static int hinic_func_to_func_init(struct hinic_hwdev *hwdev) err = alloc_mbox_info(func_to_func->mbox_resp); if (err) { - PMD_DRV_LOG(ERR, "Allocating memory for mailbox responsing failed"); + PMD_DRV_LOG(ERR, "Allocating memory for mailbox responding failed"); goto alloc_mbox_for_resp_err; } diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 9d61dd68f7..03debf79b1 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -4674,7 +4674,7 @@ send_loop: /* * Calculate the number of available resources - elts and WQEs. * There are two possible different scenarios: - * - no data inlining into WQEs, one WQEBB may contains upto + * - no data inlining into WQEs, one WQEBB may contains up to * four packets, in this case elts become scarce resource * - data inlining into WQEs, one packet may require multiple * WQEBBs, the WQEs become the limiting factor. diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c index bdf2a7c76a..b1de866d34 100644 --- a/drivers/net/pfe/pfe_ethdev.c +++ b/drivers/net/pfe/pfe_ethdev.c @@ -13,7 +13,7 @@ #include "pfe_logs.h" #include "pfe_mod.h" -#define PFE_MAX_MACS 1 /*we can support upto 4 MACs per IF*/ +#define PFE_MAX_MACS 1 /* we can support up to 4 MACs per IF */ #define PFE_VDEV_GEM_ID_ARG "intf" struct pfe_vdev_init_params { diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index e01d437f19..c7a4c031b7 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -1064,7 +1064,7 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev) qede_reset_queue_stats(qdev, true); /* Newer SR-IOV PF driver expects RX/TX queues to be started before - * enabling RSS. Hence RSS configuration is deferred upto this point. + * enabling RSS. Hence RSS configuration is deferred up to this point. * Also, we would like to retain similar behavior in PF case, so we * don't do PF/VF specific check here. */ diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c index 9530ee55f8..e6d4cc7178 100644 --- a/lib/librte_eal/linux/eal/eal.c +++ b/lib/librte_eal/linux/eal/eal.c @@ -1077,7 +1077,7 @@ rte_eal_init(int argc, char **argv) #if defined(RTE_LIBRTE_KNI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) } else if (rte_eal_check_module("rte_kni") == 1) { iova_mode = RTE_IOVA_PA; - RTE_LOG(DEBUG, EAL, "KNI is loaded, selecting IOVA as PA mode for better KNI perfomance.\n"); + RTE_LOG(DEBUG, EAL, "KNI is loaded, selecting IOVA as PA mode for better KNI performance.\n"); #endif } else if (is_iommu_enabled()) { /* we have an IOMMU, pick IOVA as VA mode */ diff --git a/lib/librte_ipsec/sa.h b/lib/librte_ipsec/sa.h index 51e69ad05a..0cfe82f634 100644 --- a/lib/librte_ipsec/sa.h +++ b/lib/librte_ipsec/sa.h @@ -113,7 +113,7 @@ struct rte_ipsec_sa { * sqn and replay window * In case of SA handled by multiple threads *sqn* cacheline * could be shared by multiple cores. - * To minimise perfomance impact, we try to locate in a separate + * To minimise performance impact, we try to locate in a separate * place from other frequently accesed data. */ union { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:49.430124535 +0100 +++ 0122-fix-various-typos-found-by-Lintian.patch 2020-05-19 14:04:44.428652215 +0100 @@ -1,9 +1,9 @@ -From 611faa5f46cc67449f272e14450fc6a0a275767d Mon Sep 17 00:00:00 2001 +From 0d7e4fbf2d6b4fffc5590bc373b1eb84442a86fb Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 29 Feb 2020 16:37:06 +0000 Subject: [PATCH] fix various typos found by Lintian -Cc: stable@dpdk.org +[ upstream commit 611faa5f46cc67449f272e14450fc6a0a275767d ] Signed-off-by: Luca Boccassi --- @@ -20,15 +20,15 @@ drivers/net/mlx5/mlx5_rxtx.c | 2 +- drivers/net/pfe/pfe_ethdev.c | 2 +- drivers/net/qede/qede_ethdev.c | 2 +- - lib/librte_eal/linux/eal.c | 2 +- + lib/librte_eal/linux/eal/eal.c | 2 +- lib/librte_ipsec/sa.h | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c -index 22fb23a92d..1375f223eb 100644 +index d9f5f6f167..1dbde50566 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c -@@ -95,7 +95,7 @@ static void cmd_help_brief_parsed(__rte_unused void *parsed_result, +@@ -94,7 +94,7 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result, " help ports : Configuring ports.\n" " help registers : Reading and setting port registers.\n" " help filters : Filters configuration help.\n" @@ -37,7 +37,7 @@ " help devices : Device related cmds.\n" " help all : All of the above sections.\n\n" ); -@@ -5150,7 +5150,7 @@ cmd_gso_size_parsed(void *parsed_result, +@@ -5122,7 +5122,7 @@ cmd_gso_size_parsed(void *parsed_result, if (test_done == 0) { printf("Before setting GSO segsz, please first" @@ -47,10 +47,10 @@ } diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c -index 8200b4f71e..71bdab6917 100644 +index 61ecffc184..f2922e05e0 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c -@@ -1157,7 +1157,7 @@ test_refcnt_mbuf(void) +@@ -1144,7 +1144,7 @@ test_refcnt_mbuf(void) tref += refcnt_lcore[slave]; if (tref != refcnt_lcore[master]) @@ -60,10 +60,10 @@ rte_mempool_dump(stdout, refcnt_pool); diff --git a/drivers/common/octeontx2/hw/otx2_npc.h b/drivers/common/octeontx2/hw/otx2_npc.h -index 8083c780e1..efde1e214a 100644 +index 3dfc137a30..600084ff31 100644 --- a/drivers/common/octeontx2/hw/otx2_npc.h +++ b/drivers/common/octeontx2/hw/otx2_npc.h -@@ -215,7 +215,7 @@ enum npc_kpu_lc_ltype { +@@ -213,7 +213,7 @@ enum npc_kpu_lc_ltype { NPC_LT_LC_FCOE, }; @@ -72,7 +72,7 @@ * effect flow tag calculation and thus RSS. */ enum npc_kpu_ld_ltype { -@@ -262,7 +262,7 @@ enum npc_kpu_lg_ltype { +@@ -260,7 +260,7 @@ enum npc_kpu_lg_ltype { NPC_LT_LG_TU_ETHER_IN_NSH, }; @@ -108,10 +108,10 @@ dev_info->max_event_ports = rte_lcore_count(); dev_info->max_event_port_dequeue_depth = diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 1a3c7e6098..6d42e3f85f 100644 +index a4cd6cc672..90e65d1a56 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -1752,7 +1752,7 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev, +@@ -1517,7 +1517,7 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev, } if (hash_types) { PMD_DRV_LOG(ERR, @@ -121,10 +121,10 @@ return -ENOTSUP; } diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c -index a46515d3b6..166c39ba55 100644 +index 9070f4960d..2fb77b4abb 100644 --- a/drivers/net/cxgbe/cxgbe_flow.c +++ b/drivers/net/cxgbe/cxgbe_flow.c -@@ -233,7 +233,7 @@ ch_rte_parsetype_port(const void *dmask, const struct rte_flow_item *item, +@@ -230,7 +230,7 @@ ch_rte_parsetype_port(const void *dmask, const struct rte_flow_item *item, if (val->index > 0x7) return rte_flow_error_set(e, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, @@ -167,10 +167,10 @@ } key_iova = (void *)((size_t)flow + sizeof(struct rte_flow)); diff --git a/drivers/net/hinic/base/hinic_pmd_mbox.c b/drivers/net/hinic/base/hinic_pmd_mbox.c -index bf83fbd7ef..ab1106a37d 100644 +index 935d60bc81..cfe91ddbad 100644 --- a/drivers/net/hinic/base/hinic_pmd_mbox.c +++ b/drivers/net/hinic/base/hinic_pmd_mbox.c -@@ -869,7 +869,7 @@ static int hinic_func_to_func_init(struct hinic_hwdev *hwdev) +@@ -870,7 +870,7 @@ static int hinic_func_to_func_init(struct hinic_hwdev *hwdev) err = alloc_mbox_info(func_to_func->mbox_resp); if (err) { @@ -180,10 +180,10 @@ } diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c -index 0010b423df..a21201038c 100644 +index 9d61dd68f7..03debf79b1 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c -@@ -4850,7 +4850,7 @@ send_loop: +@@ -4674,7 +4674,7 @@ send_loop: /* * Calculate the number of available resources - elts and WQEs. * There are two possible different scenarios: @@ -206,10 +206,10 @@ struct pfe_vdev_init_params { diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c -index 74dfe895ad..1542073a27 100644 +index e01d437f19..c7a4c031b7 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c -@@ -1100,7 +1100,7 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev) +@@ -1064,7 +1064,7 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev) qede_reset_queue_stats(qdev, true); /* Newer SR-IOV PF driver expects RX/TX queues to be started before @@ -218,11 +218,11 @@ * Also, we would like to retain similar behavior in PF case, so we * don't do PF/VF specific check here. */ -diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c -index 937d867aa6..aa72d36509 100644 ---- a/lib/librte_eal/linux/eal.c -+++ b/lib/librte_eal/linux/eal.c -@@ -1084,7 +1084,7 @@ rte_eal_init(int argc, char **argv) +diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c +index 9530ee55f8..e6d4cc7178 100644 +--- a/lib/librte_eal/linux/eal/eal.c ++++ b/lib/librte_eal/linux/eal/eal.c +@@ -1077,7 +1077,7 @@ rte_eal_init(int argc, char **argv) #if defined(RTE_LIBRTE_KNI) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) } else if (rte_eal_check_module("rte_kni") == 1) { iova_mode = RTE_IOVA_PA; @@ -232,10 +232,10 @@ } else if (is_iommu_enabled()) { /* we have an IOMMU, pick IOVA as VA mode */ diff --git a/lib/librte_ipsec/sa.h b/lib/librte_ipsec/sa.h -index d22451b38a..29cfe7279a 100644 +index 51e69ad05a..0cfe82f634 100644 --- a/lib/librte_ipsec/sa.h +++ b/lib/librte_ipsec/sa.h -@@ -115,7 +115,7 @@ struct rte_ipsec_sa { +@@ -113,7 +113,7 @@ struct rte_ipsec_sa { * sqn and replay window * In case of SA handled by multiple threads *sqn* cacheline * could be shared by multiple cores.