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 28696A04F0 for ; Tue, 10 Dec 2019 16:01:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1B2551BEC4; Tue, 10 Dec 2019 16:01:27 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 188EA1BF30 for ; Tue, 10 Dec 2019 16:01:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LugnFlC0t5C7UGH3dTm1mGHAJatw//RtGuOUQmT4bI8=; b=C4zyT27/9QhpYl0X8v+4YkRtocniurE7pPrT1Cp/DXrN64zmMc0b9Ff27fiUNX2/xDJlgL nLyduIOMqBbqG7qwpGVgoRD+15SaL1smW71JJtiWXskx/ByZiDPhWynA2BVz3QOlngM1rS X0b+xFTCqQt8xozBWQ0f85X7FWUeo3Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-301-Veo4xn2qN8Wn5IYG4ce1lQ-1; Tue, 10 Dec 2019 10:01:19 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A6241005513; Tue, 10 Dec 2019 15:01:18 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id B63FD5D9C5; Tue, 10 Dec 2019 15:01:17 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Anatoly Burakov , dpdk stable Date: Tue, 10 Dec 2019 14:59:21 +0000 Message-Id: <20191210145937.32755-47-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: Veo4xn2qN8Wn5IYG4ce1lQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'doc: fix description of links to EAL options pages' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/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 rebasi= ng (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/a6aa809639cf072112= d84750936fb5a698f923b4 Thanks. Kevin. --- >From a6aa809639cf072112d84750936fb5a698f923b4 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Thu, 24 Oct 2019 16:17:51 +0300 Subject: [PATCH] doc: fix description of links to EAL options pages [ upstream commit c41c100b2278ed4d56fc548697c90e103cc523e2 ] Documentation includes separate pages of EAL command-line options for Linux and for FreeBSD. Links to these pages use the same text 'EAL parameters', so it is not clear which link to use for which environment. This patch adds the text '(Linux)' and '(FreeBSD)' where relevant, to clearly identify the links. Fixes: 3ee567cfec37 ("doc: document all EAL parameters in one place") Signed-off-by: Dekel Peled Acked-by: Anatoly Burakov --- doc/guides/sample_app_ug/intro.rst | 6 +++--- doc/guides/testpmd_app_ug/run_app.rst | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/guides/sample_app_ug/intro.rst b/doc/guides/sample_app_ug/= intro.rst index 90704194a..71d99f981 100644 --- a/doc/guides/sample_app_ug/intro.rst +++ b/doc/guides/sample_app_ug/intro.rst @@ -16,7 +16,7 @@ Running Sample Applications Some sample applications may have their own command-line parameters descri= bed in their respective guides, however all of them also share the same EAL param= eters. -Please refer to :doc:`../linux_gsg/linux_eal_parameters` or -:doc:`../freebsd_gsg/freebsd_eal_parameters` for a list of available EAL -command-line options. +Please refer to :doc:`EAL parameters (Linux) <../linux_gsg/linux_eal_param= eters>` +or :doc:`EAL parameters (FreeBSD) <../freebsd_gsg/freebsd_eal_parameters>`= for +a list of available EAL command-line options. =20 =20 diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app= _ug/run_app.rst index 89df03166..5a3ad411a 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -8,7 +8,7 @@ EAL Command-line Options ------------------------ =20 -Please refer to :doc:`../linux_gsg/linux_eal_parameters` or -:doc:`../freebsd_gsg/freebsd_eal_parameters` for a list of available EAL -command-line options. +Please refer to :doc:`EAL parameters (Linux) <../linux_gsg/linux_eal_param= eters>` +or :doc:`EAL parameters (FreeBSD) <../freebsd_gsg/freebsd_eal_parameters>`= for +a list of available EAL command-line options. =20 =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:42.210494782 +0000 +++ 0047-doc-fix-description-of-links-to-EAL-options-pages.patch=092019-12-= 10 14:49:39.079457264 +0000 @@ -1 +1 @@ -From c41c100b2278ed4d56fc548697c90e103cc523e2 Mon Sep 17 00:00:00 2001 +From a6aa809639cf072112d84750936fb5a698f923b4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c41c100b2278ed4d56fc548697c90e103cc523e2 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 6a3b6722e..0b4ab1ba4 100644 +index 90704194a..71d99f981 100644 @@ -40 +41 @@ -index ef677ba2f..00e0c2ac5 100644 +index 89df03166..5a3ad411a 100644