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 9FC1CA0C47 for ; Tue, 10 Aug 2021 17:45:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 953B0411C7; Tue, 10 Aug 2021 17:45:02 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id D427E4014F for ; Tue, 10 Aug 2021 17:45:00 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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-canonical-1.canonical.com (Postfix) with ESMTPS id BC1BD3F107 for ; Tue, 10 Aug 2021 15:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610300; bh=KaB9zW/JQsQ9QskoVwCUlw2XX8nBppMu5lgD6xGA1bs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=INCZgISCZxCCT168oT0fwhOoEPVZ3CelWR811VgxMtLNFWfEdd49lU8zgUP5nRqx4 8w1yqgFiDqpBN9Bnm3RI6Pu8r9vFpHhijUqE4PhxdC/cedzsilMEe3+/Go+0TfcNuT I9KQNd8+vqexiJTiCF5K+KoUlPYIebFVU3Lj+aY/6LxxcCrM8imQt+jev+wA1v3LgX XmBs1Xbga0Kl6VavYpS6ZzVU0DCff/0ID3oD/u0HO6+qyZX2DaqK55T9WFbLoG/PMc whI6rD+3QFUzWch5KEg7PHcXlnP/MGOOkuy3ybOvZKxGRKpuCuky5qRzuiSGuhvcyo NMQAEsOxktbTQ== Received: by mail-ej1-f70.google.com with SMTP id ci25-20020a1709072679b029058e79f6c38aso5748305ejc.13 for ; Tue, 10 Aug 2021 08:45:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KaB9zW/JQsQ9QskoVwCUlw2XX8nBppMu5lgD6xGA1bs=; b=O7yW8WUNlARhg1F7C3k5qDBbkeGIzuhnFAjDdqLVi2f43KHD65Ini2QxngJ+3Qx/oW mwmlB+n1izmu1NgGJaHMqvEo+4igPUtxyLlmRUQikwLUH8Fe2/xu2YkeS0xNAwbtppNo v8TNtaoV4YOqcs00W622NRt6KTWZ6+bVz6xLPQOJ4b7pOl2+3Q7t50v40at0MwIFhsR6 /nk+dAXcyEz0MuArr5ccdqO6NnCcTTAVbG8cFFtyqJPCndyCzbo/Kbdw6UvFvnTbu32+ 3qAGPgj2C3clxnwen+6iykLgT0vIRCh5uxbO72pp+fEsHOOrBu7Ojyhuxn+N/PVpuZRL y3YQ== X-Gm-Message-State: AOAM531qfdd1TsS1SYLwcyVLF0uBg4pZ4iJFZ3Oyz94McQiqkw8Wv5a1 2BWa9CUDoXhoWT+9AHxQIN+NO566aeWzKMhWnWym2PsBColM2wqpcyYg6YFDFLK6n1eY+nzjf38 bHfxmd2gu4prhoOFlbc4RRnuT X-Received: by 2002:a17:906:6dc1:: with SMTP id j1mr28660535ejt.324.1628610300461; Tue, 10 Aug 2021 08:45:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrJLqAQmc1tGmg2FEHVRthjv4T19HPItQ2uAqoEHJ/MxNARZHdpKMyy77uH71NOfeXTgN6mw== X-Received: by 2002:a17:906:6dc1:: with SMTP id j1mr28660512ejt.324.1628610300229; Tue, 10 Aug 2021 08:45:00 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id s24sm1712089edq.56.2021.08.10.08.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:44:59 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Ferruh Yigit Cc: Andrew Rybchenko , dpdk stable Date: Tue, 10 Aug 2021 17:40:10 +0200 Message-Id: <20210810154022.749358-90-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix help string for port reset' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/7ec9ebd3eca1a480104204dfe8f56eb84ace85a4 Thanks. Christian Ehrhardt --- >From 7ec9ebd3eca1a480104204dfe8f56eb84ace85a4 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 23 Jul 2021 13:24:19 +0100 Subject: [PATCH] app/testpmd: fix help string for port reset [ upstream commit a2db845cccf4aaab428fbff613a94e8e86418d41 ] Command help string is missing 'reset' keyword, although description has it. Adding it. Fixes: 97f1e196799f ("app/testpmd: add port reset command") Signed-off-by: Ferruh Yigit Reviewed-by: Andrew Rybchenko --- app/test-pmd/cmdline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 3eedb82486..e6c053ad57 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1324,7 +1324,7 @@ cmdline_parse_token_string_t cmd_operate_port_all_all = cmdline_parse_inst_t cmd_operate_port = { .f = cmd_operate_port_parsed, .data = NULL, - .help_str = "port start|stop|close all: Start/Stop/Close/Reset all ports", + .help_str = "port start|stop|close|reset all: Start/Stop/Close/Reset all ports", .tokens = { (void *)&cmd_operate_port_all_cmd, (void *)&cmd_operate_port_all_port, @@ -1371,7 +1371,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id = cmdline_parse_inst_t cmd_operate_specific_port = { .f = cmd_operate_specific_port_parsed, .data = NULL, - .help_str = "port start|stop|close : Start/Stop/Close/Reset port_id", + .help_str = "port start|stop|close|reset : Start/Stop/Close/Reset port_id", .tokens = { (void *)&cmd_operate_specific_port_cmd, (void *)&cmd_operate_specific_port_port, -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:16.480591990 +0200 +++ 0090-app-testpmd-fix-help-string-for-port-reset.patch 2021-08-10 15:11:13.122638850 +0200 @@ -1 +1 @@ -From a2db845cccf4aaab428fbff613a94e8e86418d41 Mon Sep 17 00:00:00 2001 +From 7ec9ebd3eca1a480104204dfe8f56eb84ace85a4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a2db845cccf4aaab428fbff613a94e8e86418d41 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 8468018cf3..905a6143eb 100644 +index 3eedb82486..e6c053ad57 100644 @@ -22 +23 @@ -@@ -1237,7 +1237,7 @@ cmdline_parse_token_string_t cmd_operate_port_all_all = +@@ -1324,7 +1324,7 @@ cmdline_parse_token_string_t cmd_operate_port_all_all = @@ -31 +32 @@ -@@ -1284,7 +1284,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id = +@@ -1371,7 +1371,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id =