[dpdk-stable] patch 'fix various typos found by Lintian' has been queued to LTS release 18.11.9
Kevin Traynor
ktraynor at redhat.com
Thu May 28 18:23:19 CEST 2020
Hi,
FYI, your patch has been queued to LTS release 18.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/03/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.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b54911b0bda95bd879e9231ee60bfb76038f4867
Thanks.
Kevin.
---
>From b54911b0bda95bd879e9231ee60bfb76038f4867 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca at debian.org>
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 <bluca at debian.org>
---
app/test-pmd/cmdline.c | 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/qede/qede_ethdev.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 26295130c5..2913de68f4 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -102,5 +102,5 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
" 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 all : All of the above sections.\n\n"
);
@@ -4933,5 +4933,5 @@ 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/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
@@ -407,5 +407,5 @@ 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);
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index b8cb437a0c..270ebbe850 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -380,5 +380,5 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,
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();
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 2dbfd11cd7..219d836d91 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1112,5 +1112,5 @@ 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 b6250a2a90..d2466f29e4 100644
--- a/drivers/net/cxgbe/cxgbe_flow.c
+++ b/drivers/net/cxgbe/cxgbe_flow.c
@@ -157,5 +157,5 @@ ch_rte_parsetype_port(const void *dmask, const struct rte_flow_item *item,
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/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 49f7b32056..791556dc52 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -1047,5 +1047,5 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)
/* 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.
--
2.21.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-28 17:13:03.869089799 +0100
+++ 0092-fix-various-typos-found-by-Lintian.patch 2020-05-28 17:12:59.212553889 +0100
@@ -1 +1 @@
-From 611faa5f46cc67449f272e14450fc6a0a275767d Mon Sep 17 00:00:00 2001
+From b54911b0bda95bd879e9231ee60bfb76038f4867 Mon Sep 17 00:00:00 2001
@@ -6 +6 @@
-Cc: stable at dpdk.org
+[ upstream commit 611faa5f46cc67449f272e14450fc6a0a275767d ]
@@ -11,2 +10,0 @@
- app/test/test_mbuf.c | 2 +-
- drivers/common/octeontx2/hw/otx2_npc.h | 4 ++--
@@ -17,5 +14,0 @@
- 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 +-
@@ -23,3 +16 @@
- lib/librte_eal/linux/eal.c | 2 +-
- lib/librte_ipsec/sa.h | 2 +-
- 15 files changed, 18 insertions(+), 18 deletions(-)
+ 6 files changed, 7 insertions(+), 7 deletions(-)
@@ -28 +19 @@
-index 22fb23a92d..1375f223eb 100644
+index 26295130c5..2913de68f4 100644
@@ -31 +22 @@
-@@ -96,5 +96,5 @@ static void cmd_help_brief_parsed(__rte_unused void *parsed_result,
+@@ -102,5 +102,5 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
@@ -36 +26,0 @@
- " help devices : Device related cmds.\n"
@@ -38 +28,2 @@
-@@ -5151,5 +5151,5 @@ cmd_gso_size_parsed(void *parsed_result,
+ );
+@@ -4933,5 +4933,5 @@ cmd_gso_size_parsed(void *parsed_result,
@@ -45,29 +35,0 @@
-diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
-index 8200b4f71e..71bdab6917 100644
---- a/app/test/test_mbuf.c
-+++ b/app/test/test_mbuf.c
-@@ -1158,5 +1158,5 @@ test_refcnt_mbuf(void)
-
- 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]);
-
-diff --git a/drivers/common/octeontx2/hw/otx2_npc.h b/drivers/common/octeontx2/hw/otx2_npc.h
-index 8083c780e1..efde1e214a 100644
---- a/drivers/common/octeontx2/hw/otx2_npc.h
-+++ b/drivers/common/octeontx2/hw/otx2_npc.h
-@@ -216,5 +216,5 @@ enum npc_kpu_lc_ltype {
- };
-
--/* 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.
- */
-@@ -263,5 +263,5 @@ enum npc_kpu_lg_ltype {
- };
-
--/* 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.
- */
@@ -86 +48 @@
-index 1833d659d8..2be6e12f66 100644
+index b8cb437a0c..270ebbe850 100644
@@ -89 +51 @@
-@@ -392,5 +392,5 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,
+@@ -380,5 +380,5 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,
@@ -97 +59 @@
-index 1a3c7e6098..6d42e3f85f 100644
+index 2dbfd11cd7..219d836d91 100644
@@ -100 +62 @@
-@@ -1753,5 +1753,5 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev,
+@@ -1112,5 +1112,5 @@ static int bnxt_rss_hash_conf_get_op(struct rte_eth_dev *eth_dev,
@@ -108 +70 @@
-index a46515d3b6..166c39ba55 100644
+index b6250a2a90..d2466f29e4 100644
@@ -111 +73 @@
-@@ -234,5 +234,5 @@ ch_rte_parsetype_port(const void *dmask, const struct rte_flow_item *item,
+@@ -157,5 +157,5 @@ ch_rte_parsetype_port(const void *dmask, const struct rte_flow_item *item,
@@ -118,62 +79,0 @@
-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
-@@ -1851,5 +1851,5 @@ struct rte_flow *dpaa2_flow_create(struct rte_eth_dev *dev,
- if (!key_iova) {
- DPAA2_PMD_ERR(
-- "Memory allocation failure for rule configration\n");
-+ "Memory allocation failure for rule configuration\n");
- goto mem_failure;
- }
-@@ -1857,5 +1857,5 @@ struct rte_flow *dpaa2_flow_create(struct rte_eth_dev *dev,
- 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
-@@ -85,5 +85,5 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id,
- if (!flow) {
- DPAA2_PMD_ERR(
-- "Memory allocation failure for rule configration\n");
-+ "Memory allocation failure for rule configuration\n");
- goto creation_error;
- }
-diff --git a/drivers/net/hinic/base/hinic_pmd_mbox.c b/drivers/net/hinic/base/hinic_pmd_mbox.c
-index bf83fbd7ef..ab1106a37d 100644
---- a/drivers/net/hinic/base/hinic_pmd_mbox.c
-+++ b/drivers/net/hinic/base/hinic_pmd_mbox.c
-@@ -870,5 +870,5 @@ 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 0010b423df..a21201038c 100644
---- a/drivers/net/mlx5/mlx5_rxtx.c
-+++ b/drivers/net/mlx5/mlx5_rxtx.c
-@@ -4851,5 +4851,5 @@ 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
-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
-@@ -14,5 +14,5 @@
- #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"
-
@@ -181 +81 @@
-index 74dfe895ad..1542073a27 100644
+index 49f7b32056..791556dc52 100644
@@ -184 +84 @@
-@@ -1101,5 +1101,5 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)
+@@ -1047,5 +1047,5 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)
@@ -191,22 +90,0 @@
-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
-@@ -1085,5 +1085,5 @@ rte_eal_init(int argc, char **argv)
- } 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()) {
-diff --git a/lib/librte_ipsec/sa.h b/lib/librte_ipsec/sa.h
-index d22451b38a..29cfe7279a 100644
---- a/lib/librte_ipsec/sa.h
-+++ b/lib/librte_ipsec/sa.h
-@@ -116,5 +116,5 @@ struct rte_ipsec_sa {
- * 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.
- */
More information about the stable
mailing list