From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 22FC1A05D3 for ; Thu, 25 Apr 2019 17:42:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 106681B60E; Thu, 25 Apr 2019 17:42:20 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C09CB1B5FD for ; Thu, 25 Apr 2019 17:42:18 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 342723073AFE; Thu, 25 Apr 2019 15:42:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25B0C5D9C6; Thu, 25 Apr 2019 15:42:16 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Andrew Rybchenko , dpdk stable Date: Thu, 25 Apr 2019 16:40:37 +0100 Message-Id: <20190425154037.28778-62-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 25 Apr 2019 15:42:18 +0000 (UTC) Subject: [dpdk-stable] patch 'ethdev: fix typo in error messages' has been queued to LTS release 18.11.2 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 LTS release 18.11.2 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/01/19. 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 can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 786bd586bfdca0f03734af9f7492228ef60458ab Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Sun, 31 Mar 2019 13:46:48 +0300 Subject: [PATCH] ethdev: fix typo in error messages [ upstream commit 91e2710342abda64a8f92e8325ad58fa3216dabf ] Correct minor typing mistake: pre-queue ==> per-queue Fixes: bea1e0c70cfc ("ethdev: convert static log type usage to dynamic") Signed-off-by: Dekel Peled Reviewed-by: Andrew Rybchenko --- lib/librte_ethdev/rte_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index e901ca3d1..191658da1 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -1644,5 +1644,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, RTE_ETHDEV_LOG(ERR, "Ethdev port_id=%d rx_queue_id=%d, new added offloads 0x%"PRIx64" must be " - "within pre-queue offload capabilities 0x%"PRIx64" in %s()\n", + "within per-queue offload capabilities 0x%"PRIx64" in %s()\n", port_id, rx_queue_id, local_conf.offloads, dev_info.rx_queue_offload_capa, @@ -1748,5 +1748,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, RTE_ETHDEV_LOG(ERR, "Ethdev port_id=%d tx_queue_id=%d, new added offloads 0x%"PRIx64" must be " - "within pre-queue offload capabilities 0x%"PRIx64" in %s()\n", + "within per-queue offload capabilities 0x%"PRIx64" in %s()\n", port_id, tx_queue_id, local_conf.offloads, dev_info.tx_queue_offload_capa, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:49.416669530 +0100 +++ 0062-ethdev-fix-typo-in-error-messages.patch 2019-04-25 16:37:46.788293965 +0100 @@ -1 +1 @@ -From 91e2710342abda64a8f92e8325ad58fa3216dabf Mon Sep 17 00:00:00 2001 +From 786bd586bfdca0f03734af9f7492228ef60458ab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 91e2710342abda64a8f92e8325ad58fa3216dabf ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 8b25c2adb..8032be92f 100644 +index e901ca3d1..191658da1 100644 @@ -22 +23 @@ -@@ -1652,5 +1652,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, +@@ -1644,5 +1644,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, @@ -29 +30 @@ -@@ -1756,5 +1756,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, +@@ -1748,5 +1748,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,