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 394F5A0C41 for ; Tue, 30 Nov 2021 17:44:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 31F5C410F7; Tue, 30 Nov 2021 17:44:15 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 8B6F3410F7 for ; Tue, 30 Nov 2021 17:44:13 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 6206D3F1B1 for ; Tue, 30 Nov 2021 16:44:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290653; bh=CRbplvQI4bDV8yykEicoUFeSqkDkwuQghXFuguVp7Vo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sUMPsiamzBblOYNDOKpgOVvfnQeUaoO1gP6yDP7Dpf0DyH1nhfZjnfZvOeTyWlC55 qKO7KPljlkMy4P98S7wXDTCeaEMGXvAroYDq7Zftoh79WSFo567B0h9VaUIbPp5QWY XYRI/M0V2WdPz3kRyfDqyTcL0W08I3Gv7gjODwnHdMFGMZF9RQkFCK+DWBFRW0TEWu IerRFGz5L8lhYH3maQl5rOM636FFfGCacMO40Cnd0BEZzCy6XQZOz7U7CdhtPq1jHe nCV00F7Snt8s43wTL24BTXjWS+zxtKVuWRHrhoJQNhxbNtg1nPlikRru1PPikD243i EAMy+WPoYOfNA== Received: by mail-ed1-f71.google.com with SMTP id c1-20020aa7c741000000b003e7bf1da4bcso17392737eds.21 for ; Tue, 30 Nov 2021 08:44:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CRbplvQI4bDV8yykEicoUFeSqkDkwuQghXFuguVp7Vo=; b=TCMv28VGvU4uoccAfZKQyshm5uaUANZcIWGQTQ78spK3NjFZDSKeTZaeaSlK2gYYZJ 8H6XDEgeQoDxfAU3X2RE55CpzwOA83yGrW1ZY+VFiL+rFNuTxzmQsDfCCWleKrBCNgR8 ewO5a0I/wAi2WyDBKYY6apvFpK1AWw8VO/vLag0y+LFpdWQIz65fS+bFi1pB3CH9FPsT lf7i0xSW3YqKRS4HKIlYar1qxl6O9fy3OBDpuakJW/9R0jUTtoO/uGne3GymFEusbfrj z/sxdKqWJ108jAxOGLSuWMpgJ1ZQK1x6vB0is1kWD7DVnemP97xNhX418bVZ+IrvIsck 8Xiw== X-Gm-Message-State: AOAM530UCgj1bAX1pllM/wMjJRIVjst5YPFcOSatsdISOimjw+SWyLJs xid69ijWpSV9FVBu+Axgt7zGk9BHGptXVt/8c4YyBdb5LaYWY1R+Kdg9rR8u4nNWIRFRDUAwpmH ijlPreW09tr8sP3Kd00Wh7lky X-Received: by 2002:a05:6402:11d2:: with SMTP id j18mr134366edw.318.1638290653112; Tue, 30 Nov 2021 08:44:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxOWN94+hBXdhmAoto9S+NdB71MwsKojHoMeu/QLCMEmTVZAleDxHFURIgemvCxtP9m3T6IOg== X-Received: by 2002:a05:6402:11d2:: with SMTP id j18mr134345edw.318.1638290652977; Tue, 30 Nov 2021 08:44:12 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id d23sm3907796edq.51.2021.11.30.08.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:44:12 -0800 (PST) From: christian.ehrhardt@canonical.com To: Thomas Monjalon Cc: David Marchand , dpdk stable Subject: patch 'doc: remove repeated repeated words' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:36:00 +0100 Message-Id: <20211130163605.2460997-156-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/d0d1c1ebf8864a888ce888e4e75b114d60e40ee3 Thanks. Christian Ehrhardt --- >From d0d1c1ebf8864a888ce888e4e75b114d60e40ee3 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 5 Nov 2021 22:10:30 +0100 Subject: [PATCH] doc: remove repeated repeated words [ upstream commit 4f823975f45218c674b15ad1e9b84255eeabe08c ] Some duplicate words were detected with a script. Fixes: fdec9301f52d ("doc: add flow classify guides") Fixes: 4dc6d8e63c16 ("doc: add graph library guide") Fixes: 30d3aa861db5 ("doc: rework VM power manager user guide") Fixes: 0d547ed03717 ("examples/ipsec-secgw: support configuration file") Fixes: e64833f2273a ("examples/l2fwd-keepalive: add sample application") Signed-off-by: Thomas Monjalon Acked-by: David Marchand --- doc/guides/prog_guide/flow_classify_lib.rst | 2 +- doc/guides/sample_app_ug/ipsec_secgw.rst | 2 +- doc/guides/sample_app_ug/keep_alive.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/prog_guide/flow_classify_lib.rst b/doc/guides/prog_guide/flow_classify_lib.rst index f0ed5a1a04..7dae0bc8c6 100644 --- a/doc/guides/prog_guide/flow_classify_lib.rst +++ b/doc/guides/prog_guide/flow_classify_lib.rst @@ -366,7 +366,7 @@ Packet Matching ~~~~~~~~~~~~~~~ The ``rte_flow_classifier_query`` API is used to find packets which match a -given flow Flow rule in the table. +given flow rule in the table. This API calls the flow_classify_run internal function which calls the ``table.ops.f_lookup`` API to see if any packets in a burst match any of the Flow rules in the table. diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index eb1a57a98f..6f6e168c9b 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -330,7 +330,7 @@ where each options means: * *protect *: the specified traffic is protected by SA rule with id SA_idx - * *bypass*: the specified traffic traffic is bypassed + * *bypass*: the specified traffic is bypassed * *discard*: the specified traffic is discarded ```` diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst index 865ba69e5c..58e7985b12 100644 --- a/doc/guides/sample_app_ug/keep_alive.rst +++ b/doc/guides/sample_app_ug/keep_alive.rst @@ -78,7 +78,7 @@ options. Explanation ----------- -The following sections provide some explanation of the The +The following sections provide some explanation of the Keep-Alive/'Liveliness' conceptual scheme. As mentioned in the overview section, the initialization and run-time paths are very similar to those of the :doc:`l2_forward_real_virtual`. -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:14.906723138 +0100 +++ 0156-doc-remove-repeated-repeated-words.patch 2021-11-30 16:50:06.134876054 +0100 @@ -1 +1 @@ -From 4f823975f45218c674b15ad1e9b84255eeabe08c Mon Sep 17 00:00:00 2001 +From d0d1c1ebf8864a888ce888e4e75b114d60e40ee3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4f823975f45218c674b15ad1e9b84255eeabe08c ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,6 +19,4 @@ - doc/guides/prog_guide/flow_classify_lib.rst | 2 +- - doc/guides/prog_guide/graph_lib.rst | 2 +- - doc/guides/sample_app_ug/ipsec_secgw.rst | 2 +- - doc/guides/sample_app_ug/keep_alive.rst | 2 +- - doc/guides/sample_app_ug/vm_power_management.rst | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + doc/guides/prog_guide/flow_classify_lib.rst | 2 +- + doc/guides/sample_app_ug/ipsec_secgw.rst | 2 +- + doc/guides/sample_app_ug/keep_alive.rst | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) @@ -38,13 +36,0 @@ -diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst -index fcff9c4286..1cfdc86433 100644 ---- a/doc/guides/prog_guide/graph_lib.rst -+++ b/doc/guides/prog_guide/graph_lib.rst -@@ -220,7 +220,7 @@ the user needs to update the context of the node hence access to - ``struct rte_node *`` memory. - - ``rte_graph_foreach_node()``, ``rte_graph_node_get()``, --``rte_graph_node_get_by_name()`` APIs can be used to to get the -+``rte_graph_node_get_by_name()`` APIs can be used to get the - ``struct rte_node*``. ``rte_graph_foreach_node()`` iterator function works on - ``struct rte_graph *`` fast-path graph object while others works on graph ID or name. - @@ -52 +38 @@ -index 2304141ce8..c53ee7c386 100644 +index eb1a57a98f..6f6e168c9b 100644 @@ -55 +41 @@ -@@ -443,7 +443,7 @@ where each options means: +@@ -330,7 +330,7 @@ where each options means: @@ -65 +51 @@ -index b6d75c8a80..a907ff36a1 100644 +index 865ba69e5c..58e7985b12 100644 @@ -77,13 +62,0 @@ -diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst -index 35afdac63f..7160b6a63a 100644 ---- a/doc/guides/sample_app_ug/vm_power_management.rst -+++ b/doc/guides/sample_app_ug/vm_power_management.rst -@@ -236,7 +236,7 @@ Compiling and Running the Host Application - Compiling the Host Application - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - --For information on compiling the DPDK and sample applications, see -+For information on compiling the DPDK and sample applications, - see :doc:`compiling`. - - The application is located in the ``vm_power_manager`` subdirectory.