[dpdk-stable] patch 'fix same typo in multiple places' has been queued to stable release 19.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri May 22 11:40:17 CEST 2020


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/24/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 4b369799c7d9e78003386f49786f6347db8dccf3 Mon Sep 17 00:00:00 2001
From: Muhammad Bilal <m.bilal at emumba.com>
Date: Fri, 15 May 2020 21:50:54 +0500
Subject: [PATCH] fix same typo in multiple places

[ upstream commit 5a448a55b4bb39720a42d9a186ed35dd6515e980 ]

Removed the typing error in doc/guides/eventdevs/index.rst,
drivers/net/mlx5/mlx5.c and in lib/librte_vhost/rte_vhost.h

Bugzilla ID: 477
Fixes: 0857b9421138 ("doc: add event device and software eventdev")
Fixes: 039253166a57 ("vhost: add device op when notification to guest is sent")
Fixes: ad74bc619504 ("net/mlx5: support multiport IB device during probing")

Signed-off-by: Muhammad Bilal <m.bilal at emumba.com>
---
 doc/guides/eventdevs/index.rst | 2 +-
 drivers/net/mlx5/mlx5.c        | 2 +-
 lib/librte_vhost/rte_vhost.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/eventdevs/index.rst b/doc/guides/eventdevs/index.rst
index 570905b813..bb66a5eacc 100644
--- a/doc/guides/eventdevs/index.rst
+++ b/doc/guides/eventdevs/index.rst
@@ -5,7 +5,7 @@ Event Device Drivers
 ====================
 
 The following are a list of event device PMDs, which can be used from an
-application trough the eventdev API.
+application through the eventdev API.
 
 .. toctree::
     :maxdepth: 2
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 2349a62674..9161114978 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -3109,7 +3109,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 		/*
 		 * Single IB device with multiple ports found,
 		 * it may be E-Switch master device and representors.
-		 * We have to perform identification trough the ports.
+		 * We have to perform identification through the ports.
 		 */
 		assert(nl_rdma >= 0);
 		assert(ns == 0);
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index ad6e717026..532ee0dec7 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -258,7 +258,7 @@ struct vhost_device_ops {
 
 	/**
 	 * This callback gets called each time a guest gets notified
-	 * about waiting packets. This is the interrupt handling trough
+	 * about waiting packets. This is the interrupt handling through
 	 * the eventfd_write(callfd), which can be used for counting these
 	 * "slow" syscalls.
 	 */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:40.707630540 +0100
+++ 0038-fix-same-typo-in-multiple-places.patch	2020-05-22 10:37:39.244414793 +0100
@@ -1,8 +1,10 @@
-From 5a448a55b4bb39720a42d9a186ed35dd6515e980 Mon Sep 17 00:00:00 2001
+From 4b369799c7d9e78003386f49786f6347db8dccf3 Mon Sep 17 00:00:00 2001
 From: Muhammad Bilal <m.bilal at emumba.com>
 Date: Fri, 15 May 2020 21:50:54 +0500
 Subject: [PATCH] fix same typo in multiple places
 
+[ upstream commit 5a448a55b4bb39720a42d9a186ed35dd6515e980 ]
+
 Removed the typing error in doc/guides/eventdevs/index.rst,
 drivers/net/mlx5/mlx5.c and in lib/librte_vhost/rte_vhost.h
 
@@ -10,7 +12,6 @@
 Fixes: 0857b9421138 ("doc: add event device and software eventdev")
 Fixes: 039253166a57 ("vhost: add device op when notification to guest is sent")
 Fixes: ad74bc619504 ("net/mlx5: support multiport IB device during probing")
-Cc: stable at dpdk.org
 
 Signed-off-by: Muhammad Bilal <m.bilal at emumba.com>
 ---
@@ -33,23 +34,23 @@
  .. toctree::
      :maxdepth: 2
 diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
-index ab4adecdc3..5589772eb8 100644
+index 2349a62674..9161114978 100644
 --- a/drivers/net/mlx5/mlx5.c
 +++ b/drivers/net/mlx5/mlx5.c
-@@ -3374,7 +3374,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+@@ -3109,7 +3109,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
  		/*
  		 * Single IB device with multiple ports found,
  		 * it may be E-Switch master device and representors.
 -		 * We have to perform identification trough the ports.
 +		 * We have to perform identification through the ports.
  		 */
- 		MLX5_ASSERT(nl_rdma >= 0);
- 		MLX5_ASSERT(ns == 0);
+ 		assert(nl_rdma >= 0);
+ 		assert(ns == 0);
 diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
-index 5c72fba797..d43669f2c2 100644
+index ad6e717026..532ee0dec7 100644
 --- a/lib/librte_vhost/rte_vhost.h
 +++ b/lib/librte_vhost/rte_vhost.h
-@@ -259,7 +259,7 @@ struct vhost_device_ops {
+@@ -258,7 +258,7 @@ struct vhost_device_ops {
  
  	/**
  	 * This callback gets called each time a guest gets notified


More information about the stable mailing list