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 9683343337 for ; Wed, 15 Nov 2023 12:45:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9066F40294; Wed, 15 Nov 2023 12:45:28 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 3527640285 for ; Wed, 15 Nov 2023 12:45:26 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-407c3adef8eso57494375e9.2 for ; Wed, 15 Nov 2023 03:45:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700048726; x=1700653526; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L6/cEa1lXyqSVPCqUIF/pQ8FntVvQdyY+2FU9EjzZBc=; b=M2kJpRNTaFyEmj8OXh/fTP20/R/IzsPjp2Oe3VRvrIxm3VVshE1LhaVlNjZTUFh7bR CkvBGBIi4VX4ElgPrcy+M4py3NO1XARRK73rHD7iX9TQlc3MDWby3w6B+Gge0f5EhmfO nY4qLDfFm3Ugt6rDA6VUNE6SG1JVP+VkG8GsGZgu+yPAUqR3ss+qhtRCXWGoDjv79rDP qU5ggJdO30kgvCVV5DuowZ7tduyOXZaa2mAsEGEMz5rwnYae/0fYAyplc8KceEUS9ybc PKvmmUWBgrRIHy+7PbelfpZCx5uB5WyIUCQA+SiH96yclafN1lRSCHJPwGwsl3BQ7gm1 KwTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700048726; x=1700653526; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L6/cEa1lXyqSVPCqUIF/pQ8FntVvQdyY+2FU9EjzZBc=; b=qywFfzB9EtzhJVArUw97Vdxk/R/B1+lQijx6cUje5nE+EakrCOiQmfm4gMfnaO/nO+ EivZKe5QPF6QxoR9iQnlrxW0xkZUS+QUfPdhxzv99wwM0mB2int5663VsQ8ALBwCqlHd iIiDJuQISA9poRHKpwJyJyNUAL8u1PmfmqPhgilfHjqUhrqnXzMrOKxrIX9czOhZ64AM NtGn3+Jg68EYe1fXFRq9X9M9a84AXjbQ0u7zdyelzigMmBUhVfPjAVOiDj4M7BRIZJL4 OFTupFkSIqsBLUXYPWv3S1oU2KljTZagXcHGtFgNqfc21Sg6unBldnfC2upq50PpXyh0 /AUw== X-Gm-Message-State: AOJu0YzjdISrAH8N+1RekoWWEwYsPzDl1G+RclyxzEQ95Dde395fr4W8 5rNDFWUjfwXWJxe5j7kznawsGk9aaxzWkA== X-Google-Smtp-Source: AGHT+IEbTUQnXWLtBei6SuiKFDO5+H1M9RrIwMHsCT4J6ch3Bb62/sr4J1tvBwSIkP+RRc+hJQwPsQ== X-Received: by 2002:a05:600c:4e8f:b0:405:1bbd:aa9c with SMTP id f15-20020a05600c4e8f00b004051bbdaa9cmr10806965wmq.34.1700048725682; Wed, 15 Nov 2023 03:45:25 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id i18-20020a5d6312000000b0032d9a1f2ec3sm10389301wru.27.2023.11.15.03.45.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 03:45:24 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Bruce Richardson , Cristian Dumitrescu , dpdk stable Subject: patch 'meter: fix RFC4115 trTCM API Doxygen' has been queued to stable release 20.11.10 Date: Wed, 15 Nov 2023 11:45:04 +0000 Message-Id: <20231115114515.2355140-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115114515.2355140-1-luca.boccassi@gmail.com> References: <20231108192535.922238-37-luca.boccassi@gmail.com> <20231115114515.2355140-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 20.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 11/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6486d9adc8dbd4537b4c64bbf09b048a5ec59145 Thanks. Luca Boccassi --- >From 6486d9adc8dbd4537b4c64bbf09b048a5ec59145 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/librte_meter/rte_meter.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/librte_meter/rte_meter.h b/lib/librte_meter/rte_meter.h index 62c8c1ecc2..c6a25208b7 100644 --- a/lib/librte_meter/rte_meter.h +++ b/lib/librte_meter/rte_meter.h @@ -128,9 +128,6 @@ int 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 * * @param p @@ -174,9 +171,6 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, struct rte_meter_trtcm_profile *p); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC 4115 configuration per metered traffic flow * * @param m @@ -277,9 +271,6 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, enum rte_color pkt_color); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC4115 color blind traffic metering * * @param m @@ -301,9 +292,6 @@ rte_meter_trtcm_rfc4115_color_blind_check( uint32_t pkt_len); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * trTCM RFC4115 color aware traffic metering * * @param m -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-15 11:44:13.811504390 +0000 +++ 0005-meter-fix-RFC4115-trTCM-API-Doxygen.patch 2023-11-15 11:44:13.534386798 +0000 @@ -1 +1 @@ -From d053bcdafd347a6735d47b1f0139e9c268f56972 Mon Sep 17 00:00:00 2001 +From 6486d9adc8dbd4537b4c64bbf09b048a5ec59145 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d053bcdafd347a6735d47b1f0139e9c268f56972 ] + @@ -18 +20 @@ - lib/meter/rte_meter.h | 12 ------------ + lib/librte_meter/rte_meter.h | 12 ------------ @@ -21,5 +23,5 @@ -diff --git a/lib/meter/rte_meter.h b/lib/meter/rte_meter.h -index 6ba9967436..bd68cbe389 100644 ---- a/lib/meter/rte_meter.h -+++ b/lib/meter/rte_meter.h -@@ -124,9 +124,6 @@ int +diff --git a/lib/librte_meter/rte_meter.h b/lib/librte_meter/rte_meter.h +index 62c8c1ecc2..c6a25208b7 100644 +--- a/lib/librte_meter/rte_meter.h ++++ b/lib/librte_meter/rte_meter.h +@@ -128,9 +128,6 @@ int @@ -35 +37 @@ -@@ -170,9 +167,6 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, +@@ -174,9 +171,6 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m, @@ -45 +47 @@ -@@ -273,9 +267,6 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, +@@ -277,9 +271,6 @@ rte_meter_trtcm_color_aware_check(struct rte_meter_trtcm *m, @@ -55 +57 @@ -@@ -297,9 +288,6 @@ rte_meter_trtcm_rfc4115_color_blind_check( +@@ -301,9 +292,6 @@ rte_meter_trtcm_rfc4115_color_blind_check(