From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 4C4E0322C for ; Fri, 30 Nov 2018 00:14:56 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:20:45 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW8L032075; Fri, 30 Nov 2018 01:14:49 +0200 From: Yongseok Koh To: Yong Wang Cc: Ferruh Yigit , dpdk stable Date: Thu, 29 Nov 2018 15:11:15 -0800 Message-Id: <20181129231202.30436-81-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'doc: fix typo in testpmd guide' has been queued to LTS release 17.11.5 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: , X-List-Received-Date: Thu, 29 Nov 2018 23:14:56 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 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/01/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From ae799a4f7c354618768d6e4fd82fc90a321bddc2 Mon Sep 17 00:00:00 2001 From: Yong Wang Date: Fri, 26 Oct 2018 06:27:03 -0400 Subject: [PATCH] doc: fix typo in testpmd guide [ upstream commit 153ccd050c8de4e9cc1589daee4d136434a0be61 ] The forwarding mode mac_swap should be macswap in testpmd guide. Fixes: e76d7a768ce0 ("doc: fix syntax in testpmd user guide") Signed-off-by: Yong Wang Reviewed-by: Ferruh Yigit --- doc/guides/testpmd_app_ug/run_app.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 4c0d2cede..e50281376 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -355,7 +355,7 @@ The commandline options are: io (the default) mac - mac_swap + macswap flowgen rxonly txonly -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:48.803205301 -0800 +++ 0081-doc-fix-typo-in-testpmd-guide.patch 2018-11-29 15:01:45.218958000 -0800 @@ -1,12 +1,13 @@ -From 153ccd050c8de4e9cc1589daee4d136434a0be61 Mon Sep 17 00:00:00 2001 +From ae799a4f7c354618768d6e4fd82fc90a321bddc2 Mon Sep 17 00:00:00 2001 From: Yong Wang Date: Fri, 26 Oct 2018 06:27:03 -0400 Subject: [PATCH] doc: fix typo in testpmd guide +[ upstream commit 153ccd050c8de4e9cc1589daee4d136434a0be61 ] + The forwarding mode mac_swap should be macswap in testpmd guide. Fixes: e76d7a768ce0 ("doc: fix syntax in testpmd user guide") -Cc: stable@dpdk.org Signed-off-by: Yong Wang Reviewed-by: Ferruh Yigit @@ -15,10 +16,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst -index 21924c359..851df65da 100644 +index 4c0d2cede..e50281376 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst -@@ -332,7 +332,7 @@ The commandline options are: +@@ -355,7 +355,7 @@ The commandline options are: io (the default) mac