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 944B1A0613 for ; Tue, 27 Aug 2019 11:31:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8919F1BE91; Tue, 27 Aug 2019 11:31:13 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D6BD054AE for ; Tue, 27 Aug 2019 11:31:11 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5048336961; Tue, 27 Aug 2019 09:31:11 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11F225C1D6; Tue, 27 Aug 2019 09:31:09 +0000 (UTC) From: Kevin Traynor To: Thierry Herbelot Cc: Rami Rosen , Fiona Trahe , dpdk stable Date: Tue, 27 Aug 2019 10:29:57 +0100 Message-Id: <20190827093032.20423-20-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 27 Aug 2019 09:31:11 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix grammar in prog guides' has been queued to LTS release 18.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 LTS release 18.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 09/03/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 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/0d353ff3b699c7728689475a67be1ec0ca5128e1 Thanks. Kevin Traynor --- >From 0d353ff3b699c7728689475a67be1ec0ca5128e1 Mon Sep 17 00:00:00 2001 From: Thierry Herbelot Date: Wed, 22 May 2019 11:44:48 +0200 Subject: [PATCH] doc: fix grammar in prog guides [ upstream commit 6b1a74ef805fd48486e2af6d7ca2439adff484c3 ] A copy'n'paste typo was present in three guides. Fixes: a584d3bea902 ("doc: add compressdev library guide") Fixes: 4935e1e9f76e ("bbdev: introduce wireless base band device lib") Fixes: 0318c02b57cf ("doc: add cryptodev chapter in prog guide") Signed-off-by: Thierry Herbelot Acked-by: Rami Rosen Acked-by: Fiona Trahe --- doc/guides/prog_guide/bbdev.rst | 2 +- doc/guides/prog_guide/compressdev.rst | 2 +- doc/guides/prog_guide/cryptodev_lib.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst index dfa0ef67d..12e948a20 100644 --- a/doc/guides/prog_guide/bbdev.rst +++ b/doc/guides/prog_guide/bbdev.rst @@ -285,5 +285,5 @@ device. The dequeue burst API will retrieve any processed operations available from the queue on the bbdev device, from physical devices this is usually directly from the device's processed queue, and for virtual device's from a -``rte_ring`` where processed operations are place after being processed on the +``rte_ring`` where processed operations are placed after being processed on the enqueue call. diff --git a/doc/guides/prog_guide/compressdev.rst b/doc/guides/prog_guide/compressdev.rst index 3ba4238ce..0f572f970 100644 --- a/doc/guides/prog_guide/compressdev.rst +++ b/doc/guides/prog_guide/compressdev.rst @@ -569,5 +569,5 @@ device. The dequeue burst API will retrieve any processed operations available from the queue pair on the compression device, from physical devices this is usually directly from the devices processed queue, and for virtual device's from a -``rte_ring`` where processed operations are place after being processed on the +``rte_ring`` where processed operations are placed after being processed on the enqueue call. diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst index 09828aca6..7a95053ad 100644 --- a/doc/guides/prog_guide/cryptodev_lib.rst +++ b/doc/guides/prog_guide/cryptodev_lib.rst @@ -295,5 +295,5 @@ device. The dequeue burst API will retrieve any processed operations available from the queue pair on the Crypto device, from physical devices this is usually directly from the devices processed queue, and for virtual device's from a -``rte_ring`` where processed operations are place after being processed on the +``rte_ring`` where processed operations are placed after being processed on the enqueue call. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:12.005718135 +0100 +++ 0020-doc-fix-grammar-in-prog-guides.patch 2019-08-27 09:40:10.898144922 +0100 @@ -1 +1 @@ -From 6b1a74ef805fd48486e2af6d7ca2439adff484c3 Mon Sep 17 00:00:00 2001 +From 0d353ff3b699c7728689475a67be1ec0ca5128e1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6b1a74ef805fd48486e2af6d7ca2439adff484c3 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 27d7f04d0..607d2e7db 100644 +index dfa0ef67d..12e948a20 100644 @@ -34 +35 @@ -index a06c835a0..07332d004 100644 +index 3ba4238ce..0f572f970 100644 @@ -45 +46 @@ -index 9bbf20764..2839244c5 100644 +index 09828aca6..7a95053ad 100644 @@ -48 +49 @@ -@@ -305,5 +305,5 @@ device. The dequeue burst API will retrieve any processed operations available +@@ -295,5 +295,5 @@ device. The dequeue burst API will retrieve any processed operations available