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 761BEA0C47 for ; Mon, 26 Jul 2021 15:56:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F2F4410EC; Mon, 26 Jul 2021 15:56:23 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 4E146410E6 for ; Mon, 26 Jul 2021 15:56:22 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id e25-20020a05600c4b99b0290253418ba0fbso45394wmp.1 for ; Mon, 26 Jul 2021 06:56:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=juTHHpQ0xo5lUyudRGNy8vqhO285EofUtp8HXNeMax8=; b=PRzaHDkp0WPYFDe7rqSk6TFuak0KJ6TO7Nfl75bm3SQk1XjiZiXu2kblV++g/L2g8C gVw7waBy6Tc27JQ858EN3pEh/yz13fnq7g7qJksop14uHuVZaqIL12llRro4qdwV18y1 vDtgtpaAJFvk9KPTANyGdW7g9YrTeZBb/mEA04tiIroLI4UyCk514rEIiy06HmFhqXs7 /VPy/0Bix8UFwFmEZJdSchKexGinqmcFh6LGshFuBkDoKXrTWuIarxIb1I5TUwik1Fzt SuwkgYzSB5Bf1+I8kdRQYkOHbQR3ECVGSRTMcWvBxgiK967TiRf+ij7vpdq4JPoJW+QA jb+A== 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=juTHHpQ0xo5lUyudRGNy8vqhO285EofUtp8HXNeMax8=; b=VIbxi0SAxPv7FI3EXW4afiZvjXXMVRRrFU0l7RmDvag4BdY6RpAHlechWhNTfluBMb w0BwbGNmrtwT01ETGJCwFhUtFL7lgttEDMyBJNw00Pz4SNme3c+pNpdcE4ufcss5FcEF 2zy5C10kGgMNi/S7g/FvWtW9O73oCFfSV/vNMWeX0FPtwJlkKJaSo3JVICn8+IrAzCIY Xmn4x+eSTkYn2B08qRvW6wKDH9DfAmX4ApFfpgElSRj9N48F2fjoaeOPlXEVsA7wX9E/ nwLe8/lKTtTlnWcj88snH5kT7vbEtn/dxzAssvrUcNW/XZautBGOnAj1upXzwh5gqgHg 91NA== X-Gm-Message-State: AOAM533AH+HYbBuP316TBtNlQfPqlwSIzysl13g/2aW8qXNXCRc2+sPZ 8A3URsT8NY5jYAnDY6OuAwQ= X-Google-Smtp-Source: ABdhPJx1twbhPJpzNG8MuSGQcxJrU06KjfqSSU/vMfNoVwibNsKu0v8XyHnHS45CXCu5hvg3VWUoVA== X-Received: by 2002:a05:600c:618:: with SMTP id o24mr917623wmm.11.1627307782110; Mon, 26 Jul 2021 06:56:22 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id s13sm7253661wmc.47.2021.07.26.06.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:56:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Andrew Rybchenko , dpdk stable Date: Mon, 26 Jul 2021 14:53:21 +0100 Message-Id: <20210726135322.149850-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.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 20.11.3 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 20.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 07/28/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d0eebf4a009a1533b1d97e7f9b8932299e87ef46 Thanks. Luca Boccassi --- >From d0eebf4a009a1533b1d97e7f9b8932299e87ef46 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 113e27b603..58ebff5502 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1225,7 +1225,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, @@ -1272,7 +1272,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:19.335772456 +0100 +++ 0058-app-testpmd-fix-help-string-for-port-reset.patch 2021-07-26 13:53:15.993295650 +0100 @@ -1 +1 @@ -From a2db845cccf4aaab428fbff613a94e8e86418d41 Mon Sep 17 00:00:00 2001 +From d0eebf4a009a1533b1d97e7f9b8932299e87ef46 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 113e27b603..58ebff5502 100644 @@ -22 +23 @@ -@@ -1237,7 +1237,7 @@ cmdline_parse_token_string_t cmd_operate_port_all_all = +@@ -1225,7 +1225,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 = +@@ -1272,7 +1272,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id =