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 1A44CA0093 for ; Fri, 22 May 2020 11:42:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 10BBB1D96F; Fri, 22 May 2020 11:42:24 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 67BC21D96A for ; Fri, 22 May 2020 11:42:22 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id l17so9540283wrr.4 for ; Fri, 22 May 2020 02:42:22 -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=Fb9XsPWSk45T8gkvQLgXvuuSwlq7G+08+b7VdHBk5Rc=; b=XFCRj3/TG4scyj9iFps+oWimwsjDyDIG8RxEXkQ1Yg4TffpVrficWBMRICB5AFgHfo gt0CnnaZgOYxJKWfA5Bvxp/Lr7gmkdmZnpPL8lhtZMj1noRvvYOnPET/VONK0cTyc8kD BiKeynvJs+ZSDq13TgpjWKdQHia6GDaGzfrj0xu8NJALzE6MkKLOan9vTA+je7krqRCA noBgwPEn4sGWPVES1vdGkORseXPAdZU5YW49SjwldyVV7Lo3eEy9wUzX8dJmxUtbuYVT XQY+KzjOdXrVU7j8EU9cvH3Dh+/yPhCDy32BTCuytM+AjFfZ+zPZ3bN/ZpbV9V4KZQAW gloQ== 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=Fb9XsPWSk45T8gkvQLgXvuuSwlq7G+08+b7VdHBk5Rc=; b=eLFYTO9ERK74OTTpTpYl+cAbGzCVJhgPNV5BEbq0KlYtQdTjBNeEI+JfCaH5OvMI9f 2k5v2qlVcWESfQsZvQeXfcjPmcjD4MaiIV5+FIQIvP3t6lCmSt5pEkbv3SWzKnPdQoMc Df/ap4Vm4ompHBjx6q7OddI8pwEP64OUFhaiigAkbnXQk0HPRUvEKixba6ONX6wcrDMt o/2usHj9v8Y3xT2CPtlYirDGHSgSliuhkobIsZ+Y9/vCfur79LAXXag+FHr/c87mIPWr jzfZCNT1XfRSZ15qMQ53nI3uDLXC71zHx0eHY68Q92i2kFxrK5mItMMBt5U0JaJC7yhy e+rg== X-Gm-Message-State: AOAM5327OK13W3tRY4SvfLzpEnpWKo7MFl0nphHeS/xXItBj6wzck+vE wIPdhhBG2kwvSZ79g7MYRjHmlj7hOSttZg== X-Google-Smtp-Source: ABdhPJzMzkE34yRH+HvXwoaGOrOpFg19anegWv1qT04oXkmpvKhElSa2ZtlQhhJGfUboYJE9KUf95Q== X-Received: by 2002:adf:fb0f:: with SMTP id c15mr2840114wrr.410.1590140542110; Fri, 22 May 2020 02:42:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w15sm8812554wmi.35.2020.05.22.02.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:42:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Muhammad Bilal Cc: dpdk stable Date: Fri, 22 May 2020 10:40:17 +0100 Message-Id: <20200522094022.1025696-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'fix same typo in multiple places' 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/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 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 --- 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 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@dpdk.org Signed-off-by: Muhammad Bilal --- @@ -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