From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 82872A00C2 for ; Wed, 23 Nov 2022 19:05:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D91742DAB; Wed, 23 Nov 2022 19:05:33 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7E6D640E5A for ; Wed, 23 Nov 2022 19:05:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226729; 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=QrQLgNo5UH+FAA4PMfncaM3A8+jp5obqKh1tZhy4acY=; b=IRuYQaicbL06HlzikcK99F9z2GuSwHr+0TNBdaW83OBYXLtAQxfrn7EpFCMxXnt+yFSpvX MFKNM0X2GoZ+PKHfn31I5oVVPwGJ1KRgw1GUaayyQ/d/mH9RxA/u9Dj/IEl14PvJeaY+ma AiApxdeAo6uLFbGB2NVh1CFJG8gNMYg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-LuiKZ2ygPNKws4fsGiGVWw-1; Wed, 23 Nov 2022 13:05:26 -0500 X-MC-Unique: LuiKZ2ygPNKws4fsGiGVWw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 499FA101A56D; Wed, 23 Nov 2022 18:05:26 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99274492B0B; Wed, 23 Nov 2022 18:05:25 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Thomas Monjalon , dpdk stable Subject: patch 'doc: fix colons in testpmd aged flow rules' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:04:09 +0000 Message-Id: <20221123180413.733554-56-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.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 11/28/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/24d76003e16d92fd4db48a4a443b20e25f941847 Thanks. Kevin --- >From 24d76003e16d92fd4db48a4a443b20e25f941847 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Wed, 16 Nov 2022 14:56:24 +0200 Subject: [PATCH] doc: fix colons in testpmd aged flow rules [ upstream commit ea30023e5232084c2a455235487aa862a301fc22 ] In testpmd documentation, for listing aged-out flow rules there is some boxes of examples. In Sphinx syntax, those boxes are achieved by "::" before. However, in two places it uses ":" instead and the example looks like a regular text. This patch replace the ":" with "::" to get code box. Fixes: 0e459ffa0889 ("app/testpmd: support flow aging") Signed-off-by: Michael Baum Reviewed-by: Thomas Monjalon --- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index db59ce1e88..3a522a80a6 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -4362,5 +4362,5 @@ Listing and destroying aged flow rules ``flow aged`` simply lists aged flow rules be get from api ``rte_flow_get_aged_flows``, -and ``destroy`` parameter can be used to destroy those flow rules in PMD. +and ``destroy`` parameter can be used to destroy those flow rules in PMD:: flow aged {port_id} [destroy] @@ -4397,5 +4397,5 @@ will be ID 3, ID 1, ID 0:: 0 0 0 i-- -If attach ``destroy`` parameter, the command will destroy all the list aged flow rules. +If attach ``destroy`` parameter, the command will destroy all the list aged flow rules:: testpmd> flow aged 0 destroy -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:58.366211446 +0000 +++ 0056-doc-fix-colons-in-testpmd-aged-flow-rules.patch 2022-11-23 09:55:57.120149435 +0000 @@ -1 +1 @@ -From ea30023e5232084c2a455235487aa862a301fc22 Mon Sep 17 00:00:00 2001 +From 24d76003e16d92fd4db48a4a443b20e25f941847 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ea30023e5232084c2a455235487aa862a301fc22 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index b5649d9d9a..b5fea1396c 100644 +index db59ce1e88..3a522a80a6 100644 @@ -28 +29 @@ -@@ -4260,5 +4260,5 @@ Listing and destroying aged flow rules +@@ -4362,5 +4362,5 @@ Listing and destroying aged flow rules @@ -35 +36 @@ -@@ -4295,5 +4295,5 @@ will be ID 3, ID 1, ID 0:: +@@ -4397,5 +4397,5 @@ will be ID 3, ID 1, ID 0::