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 2E6FBA0548 for ; Sun, 28 Nov 2021 16:01:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1F07042732; Sun, 28 Nov 2021 16:01:46 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2086.outbound.protection.outlook.com [40.107.244.86]) by mails.dpdk.org (Postfix) with ESMTP id 302F24068E for ; Sun, 28 Nov 2021 16:01:45 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TzynLAcM9agRM7Qqs2Ozgp9pPhoCEvII36ojak0wM4q6cD34VAheLghbzElmH8e4cS2L24OCd8LTtuYzV3qIOaZC/ymFNCK/7FccT7yBXlv98+mOWyl+NF1IUhnb6v8PhSaDetxtQ2iinaY3gasyk4C3EVMhTiAaCiZt1vpUZvVnvj8oBANHRHeJWmqzkuCFxXzvembEcPifo0bVQySj/qIr7K74VocgNf4lQGbJxY4GyFgs+QNHhjtlmca49NoaUvmAmaiQaZlzCcm/ot5z2MaacVgQ6MG7eYmekrjAX/SEiwgnGpqtaFtsvnqkcfS9ZObjvZ7+WcY1RCSRuPcoQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pZvcM6yXpS6Ac6+y8TA1x0ilgJ6Ov4b1f1kQaLND6NI=; b=TLG3z8c8NfmOcrd2HVt3SsxiDJvfm3jQnn/Spz66wM26p0pCu9lgzUtt9zAT8HmMbmUkpt6JTqi0LFbtQnFpuOMaCCyxsOWKouLAkKD2MOw09C/OA853DcNYDrzSkFSsjEaNCJX37BRBdbaoQa7DaRzlwHII0rURs4/pkk5HV9nWFPxGXmu3WTnfNcYStU+RoP/+R8W6EgNUT/k2l73CDqQF1kGOY8YE0UhzyKZ0SXZtwxMBT1XHPQMZEihEXQQhftpJ07FmCJngED5wND8N1NyhnNMJwSv8QXiFTcbdNhRiMMzkjcVCPpD042Tg/9Jdb3qZ2SOIIO2PEwOv/sAOsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pZvcM6yXpS6Ac6+y8TA1x0ilgJ6Ov4b1f1kQaLND6NI=; b=RdHw6Nw+qYuLFYt62FJOG8IZ38jvEypzfwePkrmgQ7VkbHkBN63VcIPNcMtJPCykZlTn7aO9lAX2TAyJqu210lfr82C+v1nDiMJLXaUVkzbwrof6fNCbDirbhUmMRdGIG0aqmcTC8tE5CKGg41TXZXZfpQFD50jmIEMeO6L//5EBXy4BlbXQ0f4KScfzl0jMGuaG25R5MGTWobLeR0D//PQXilFwekEAvuXVNC6EQa+9OLKKZz4FoVCYx8Anq0xk1KefZcizuYrTHUMGcrVyzSIG6dxzuqCX7ohQzlbT+W9RRYhT3CtEfjHs9SujNohWY1BCuzQWYBM73lEOp88z7Q== Received: from BN0PR02CA0034.namprd02.prod.outlook.com (2603:10b6:408:e5::9) by BN6PR12MB1890.namprd12.prod.outlook.com (2603:10b6:404:106::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Sun, 28 Nov 2021 15:01:40 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::f5) by BN0PR02CA0034.outlook.office365.com (2603:10b6:408:e5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Sun, 28 Nov 2021 15:01:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:01:40 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 15:01:37 +0000 From: Xueming Li To: Thomas Monjalon CC: Luca Boccassi , David Marchand , dpdk stable Subject: patch 'doc: remove repeated repeated words' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:54:07 +0800 Message-ID: <20211128145423.3974892-64-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a82b70d-af63-48fa-7e34-08d9b27ffbb3 X-MS-TrafficTypeDiagnostic: BN6PR12MB1890: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DnvSF3T0PZ+uQxUYC/7ZJ+xFwPjc39Nf+59wH2JiBaDerFgVkGDIx09zO8m4Qy4F80Jl0WDIFFeq3OvA8GueRDC28XQpAMpfPj07wAZZ52miILyPsHg/Qx8HNYFFMxaGhNXfXtSHepRei+Gk+LkxP6nyegCfFZOwqAlRv3fI06dRlrQiRjYkelDdRHs4QmfEWbAj+fcx/qD59TNw5YlowupCmum2M2mgpcFNJLHBYmnIKCvZjqJngTz9SKlkCNJRObOlafRUxRMtsAK84YhcEnnq0aFDfpn0Ao1bHoPhpbZDvv4VzNCSgr3lXYW9yPCqlWFWNcLbycCEJNCS5/j/sYKKCSd7uyXgqSWrILfppwGWKAOcfIT+oZjL3wvQ/Sg/X9dKbvq+tQRTVXxfTNM92OZ9Vu5pURYouNKoqCSDJbeVKYsONdkpgOHGPccz6mR2ikCgEpK73d4Yqwmm8FLRB241qO4B0I7Q+9xa9FeUdkz1/oBSxi4AZFrBO9EL0Sz3zZa5kj3e2WsNNdL++lS4ymCKcn8ITrYnjjJkCPcFAX9Djn8qNfwuyYQe8sYYQZZLkay8OV0iwiW6IqGfIiNzl6+vgojUzkwU3UVvsdSNzuquayaRF+7PaRmnX+9LNc5FYtjf7TjXrmjWj4j1RrPgdKa3S61qnAI/j+fnPK7S5T2lCVMQT8yBOXmahtBPyQdhPd4lxozt1wX5fnYWnsRStakIBlXwET0IA+GXUIMb/9DXI/0P8nfCY375iVoR76IxATS/WyySgDBJ2Vv1PI4wroZ+/8K5HJceX+WX8HZ1uyYXErkR1ikc3mYszbXxe/eSVi432AUsfw1uN0CdjPif4g== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(356005)(4001150100001)(4326008)(508600001)(966005)(6286002)(2906002)(7636003)(55016003)(36756003)(82310400004)(36860700001)(86362001)(83380400001)(7696005)(53546011)(2616005)(54906003)(316002)(70206006)(8676002)(70586007)(5660300002)(1076003)(6916009)(8936002)(16526019)(47076005)(6666004)(186003)(26005)(336012)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:01:40.1412 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a82b70d-af63-48fa-7e34-08d9b27ffbb3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1890 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 20.11.4 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/30/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/d748677d8b45feb014da9175e314ca02b96704c2 Thanks. Xueming Li --- >From d748677d8b45feb014da9175e314ca02b96704c2 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 Cc: Xueming Li [ 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/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(-) 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/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. diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index c07275e581..b2f94963d5 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -421,7 +421,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 c9392c9951..2ecfe3cfce 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`. 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. -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.471956943 +0800 +++ 0063-doc-remove-repeated-repeated-words.patch 2021-11-28 22:41:03.403539471 +0800 @@ -1 +1 @@ -From 4f823975f45218c674b15ad1e9b84255eeabe08c Mon Sep 17 00:00:00 2001 +From d748677d8b45feb014da9175e314ca02b96704c2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4f823975f45218c674b15ad1e9b84255eeabe08c ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -52 +54 @@ -index 2304141ce8..c53ee7c386 100644 +index c07275e581..b2f94963d5 100644 @@ -55 +57 @@ -@@ -443,7 +443,7 @@ where each options means: +@@ -421,7 +421,7 @@ where each options means: @@ -65 +67 @@ -index b6d75c8a80..a907ff36a1 100644 +index c9392c9951..2ecfe3cfce 100644