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 7F542A0555 for ; Thu, 9 Jun 2022 13:38:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A4AB40220; Thu, 9 Jun 2022 13:38:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 62A5B4069C for ; Thu, 9 Jun 2022 13:38:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2Jj/SAGHOvn2FIWYf7BRyYjz9DfBCCPjox16p66d+VM=; b=EDWgKsP721tiCiyQojX/W0CmobN0h0tdP/pe172ihci06ccLaJ6RjynytVvyv8BOEYF+gi 7+0Q81Lw9/UOr+7krG1P1nBdug/QVwGnddhk/ZmZ/aE+TW9+UwJG2grKIqfJqnDC+h3KSD 6b8wdmd/CGCYzEx9FSFwO5NWdkbaUBo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-340-D75hy0nfO86Ebt-YxMH8bA-1; Thu, 09 Jun 2022 07:38:08 -0400 X-MC-Unique: D75hy0nfO86Ebt-YxMH8bA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F29F800971; Thu, 9 Jun 2022 11:38:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35A0D1730C; Thu, 9 Jun 2022 11:38:06 +0000 (UTC) From: Kevin Traynor To: Jin Liu Cc: Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix help of create meter command' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:29 +0100 Message-Id: <20220609113701.386938-42-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/694f638eb125e5d51525fa7555256dcdbd164b80 Thanks. Kevin --- >From 694f638eb125e5d51525fa7555256dcdbd164b80 Mon Sep 17 00:00:00 2001 From: Jin Liu Date: Thu, 28 Apr 2022 04:03:32 +0200 Subject: [PATCH] app/testpmd: fix help of create meter command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit dfffd090c38522fa8859e6c3e41ae6e1313787b7 ] The help message of create meter command is incomplete, lack of policy_id param, update help string. Fixes: f29fa2c59b85 ("app/testpmd: support policy actions per color") Signed-off-by: Jin Liu Signed-off-by: Chaoyong He Signed-off-by: Niklas Söderlund Acked-by: Ferruh Yigit --- app/test-pmd/cmdline_mtr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c index ad7ef6ad98..a0f885f190 100644 --- a/app/test-pmd/cmdline_mtr.c +++ b/app/test-pmd/cmdline_mtr.c @@ -818,6 +818,6 @@ cmdline_parse_inst_t cmd_create_port_meter = { .f = cmd_create_port_meter_parsed, .data = NULL, - .help_str = "create port meter (yes|no) " - " " + .help_str = "create port meter " + "(yes|no) " "[ ...]", .tokens = { -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.753712338 +0100 +++ 0042-app-testpmd-fix-help-of-create-meter-command.patch 2022-06-09 12:34:29.749980647 +0100 @@ -1 +1 @@ -From dfffd090c38522fa8859e6c3e41ae6e1313787b7 Mon Sep 17 00:00:00 2001 +From 694f638eb125e5d51525fa7555256dcdbd164b80 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit dfffd090c38522fa8859e6c3e41ae6e1313787b7 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org