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 7EB2CA0613 for ; Tue, 27 Aug 2019 11:31:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 75D7F1BE91; Tue, 27 Aug 2019 11:31:11 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 371CF1BFAD for ; Tue, 27 Aug 2019 11:31:10 +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 AAA6A308A9E0; Tue, 27 Aug 2019 09:31:09 +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 9C16E5C1B2; Tue, 27 Aug 2019 09:31:08 +0000 (UTC) From: Kevin Traynor To: Thierry Herbelot Cc: Fiona Trahe , dpdk stable Date: Tue, 27 Aug 2019 10:29:56 +0100 Message-Id: <20190827093032.20423-19-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.41]); Tue, 27 Aug 2019 09:31:09 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix triplicated typo 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/8230cee9c82aa16daef351a801ad8fd75dc11586 Thanks. Kevin Traynor --- >From 8230cee9c82aa16daef351a801ad8fd75dc11586 Mon Sep 17 00:00:00 2001 From: Thierry Herbelot Date: Wed, 22 May 2019 11:44:47 +0200 Subject: [PATCH] doc: fix triplicated typo in prog guides [ upstream commit 8b283e90e6953fe321644c2ba3abf68d154d3cd1 ] A bad formula was copied and pasted. Fixes: 4935e1e9f76e ("bbdev: introduce wireless base band device lib") Fixes: 0318c02b57cf ("doc: add cryptodev chapter in prog guide") Fixes: a9bb0c44c775 ("doc: add rawdev library guide and doxygen page") Signed-off-by: Thierry Herbelot Acked-by: Fiona Trahe --- doc/guides/prog_guide/bbdev.rst | 2 +- doc/guides/prog_guide/cryptodev_lib.rst | 2 +- doc/guides/prog_guide/rawdev.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 658ffd400..dfa0ef67d 100644 --- a/doc/guides/prog_guide/bbdev.rst +++ b/doc/guides/prog_guide/bbdev.rst @@ -45,5 +45,5 @@ From the command line using the --vdev EAL option --vdev 'baseband_turbo_sw,max_nb_queues=8,socket_id=0' -Our using the rte_vdev_init API within the application code. +Or using the rte_vdev_init API within the application code. .. code-block:: c diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst index 23770ffd4..09828aca6 100644 --- a/doc/guides/prog_guide/cryptodev_lib.rst +++ b/doc/guides/prog_guide/cryptodev_lib.rst @@ -53,5 +53,5 @@ From the command line using the --vdev EAL option Example: ``--vdev 'crypto_aesni_mb0' --vdev 'crypto_aesni_mb1'`` -Our using the rte_vdev_init API within the application code. +Or using the rte_vdev_init API within the application code. .. code-block:: c diff --git a/doc/guides/prog_guide/rawdev.rst b/doc/guides/prog_guide/rawdev.rst index 42c195cef..06af6942a 100644 --- a/doc/guides/prog_guide/rawdev.rst +++ b/doc/guides/prog_guide/rawdev.rst @@ -101,5 +101,5 @@ From the command line using the --vdev EAL option --vdev 'rawdev_dev1' -Our using the rte_vdev_init API within the application code. +Or using the rte_vdev_init API within the application code. .. code-block:: c -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:11.953915601 +0100 +++ 0019-doc-fix-triplicated-typo-in-prog-guides.patch 2019-08-27 09:40:10.895144995 +0100 @@ -1 +1 @@ -From 8b283e90e6953fe321644c2ba3abf68d154d3cd1 Mon Sep 17 00:00:00 2001 +From 8230cee9c82aa16daef351a801ad8fd75dc11586 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8b283e90e6953fe321644c2ba3abf68d154d3cd1 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 038bc6ed1..27d7f04d0 100644 +index 658ffd400..dfa0ef67d 100644 @@ -33 +34 @@ -index 23fa5bc18..9bbf20764 100644 +index 23770ffd4..09828aca6 100644