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 1A90243345 for ; Thu, 16 Nov 2023 14:25:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1425340ED6; Thu, 16 Nov 2023 14:25:11 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id AC8CF40A89 for ; Thu, 16 Nov 2023 14:25:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141108; 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=3EQIBeBMIyF5eYxlefMo1DddrkYinIhy+r9Bf2IG5zA=; b=Mu0a5Cp08FW8ycGfnQQFxoPTxaJgzp2FCV1EqOaP3z2axKHntVKWymc/2N3uE+D0WfsYJy SrMjIQhsb0B3Umf7fvIcwDOc/tDdRoFWJTO7Z5z4adMIwFgvF4zCUnKPwuzVtjtCuEX2Og NB2dzMY9niOXZHYSxvVRqV1Vnmgwafw= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-371-R7jUObvMM9qkx0NnIwzeqg-1; Thu, 16 Nov 2023 08:25:05 -0500 X-MC-Unique: R7jUObvMM9qkx0NnIwzeqg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id B0C4328AC1C3; Thu, 16 Nov 2023 13:25:04 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F1442166B27; Thu, 16 Nov 2023 13:25:03 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Bruce Richardson , Cristian Dumitrescu , dpdk stable Subject: patch 'meter: fix RFC4115 trTCM API Doxygen' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:32 +0000 Message-ID: <20231116132348.557257-50-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.6 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/21/23. 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/616bc19c65b8024d4391bc09f8eb894961671efc Thanks. Kevin --- >From 616bc19c65b8024d4391bc09f8eb894961671efc Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 23 Oct 2023 19:54:11 -0700 Subject: [PATCH] meter: fix RFC4115 trTCM API Doxygen [ upstream commit d053bcdafd347a6735d47b1f0139e9c268f56972 ] The API's for rte_meter_trtcm were documented as experimental with warning in documentation but the API's were not marked as experimental in version.map and/or with __rte_experimental. This patch removes the warnings from the docbook comment. Fixes: 30512af820fe ("meter: remove experimental flag from RFC4115 trTCM API") Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson Acked-by: Cristian Dumitrescu --- lib/meter/rte_meter.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/meter/rte_meter.h b/lib/meter/rte_meter.h index 62c8c1ecc2..c6a25208b7 100644 --- a/lib/meter/rte_meter.h +++ b/lib/meter/rte_meter.h @@ -129,7 +129,4 @@ rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p, struct rte_meter_trtcm_params *params); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC 4115 profile configuration * @@ -175,7 +172,4 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC 4115 configuration per metered traffic flow * @@ -278,7 +272,4 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC4115 color blind traffic metering * @@ -302,7 +293,4 @@ rte_meter_trtcm_rfc4115_color_blind_check( /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC4115 color aware traffic metering * -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.737272534 +0000 +++ 0050-meter-fix-RFC4115-trTCM-API-Doxygen.patch 2023-11-16 13:21:52.514946561 +0000 @@ -1 +1 @@ -From d053bcdafd347a6735d47b1f0139e9c268f56972 Mon Sep 17 00:00:00 2001 +From 616bc19c65b8024d4391bc09f8eb894961671efc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d053bcdafd347a6735d47b1f0139e9c268f56972 ] + @@ -22 +24 @@ -index 6ba9967436..bd68cbe389 100644 +index 62c8c1ecc2..c6a25208b7 100644 @@ -25 +27 @@ -@@ -125,7 +125,4 @@ rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p, +@@ -129,7 +129,4 @@ rte_meter_trtcm_profile_config(struct rte_meter_trtcm_profile *p, @@ -33 +35 @@ -@@ -171,7 +168,4 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, +@@ -175,7 +172,4 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, @@ -41 +43 @@ -@@ -274,7 +268,4 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, +@@ -278,7 +272,4 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, @@ -49 +51 @@ -@@ -298,7 +289,4 @@ rte_meter_trtcm_rfc4115_color_blind_check( +@@ -302,7 +293,4 @@ rte_meter_trtcm_rfc4115_color_blind_check(