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 BC66642ECF for ; Thu, 20 Jul 2023 17:23:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B851841144; Thu, 20 Jul 2023 17:23:40 +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 B9E95400D6 for ; Thu, 20 Jul 2023 17:23:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866619; 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=cr6KNHWUyl/II825zQgOPR8sbDN8VC/3tfs3jH/1No4=; b=KUS3f79a8vplA6jYh8nLli0knjktqeM6e1iLLSYKTfb8AS7Ypq/gaQ+ow03+xGzKNx7Dnb l2bL0LVUk0vTErhKYqQ2/HLlK5peBhyhWXKLxZTxlnplYc1wHOmA8Vee4xwzHPCJV5m6Z0 +kp3GP7oKKUO2SiGg16JgG5ZVJyqmSM= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-636-wtHYDol-P42BWgvUS_cSBw-1; Thu, 20 Jul 2023 11:22:16 -0400 X-MC-Unique: wtHYDol-P42BWgvUS_cSBw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 846E03C11A1F; Thu, 20 Jul 2023 15:22:04 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67023492C13; Thu, 20 Jul 2023 15:22:03 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Bruce Richardson , dpdk stable Subject: patch 'mbuf: fix Doxygen comment of distributor metadata' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:33 +0100 Message-ID: <20230720151942.262154-82-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.5 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/25/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/88497910a913395286bbae92e221b323b256425e Thanks. Kevin --- >From 88497910a913395286bbae92e221b323b256425e Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 15 Jun 2023 15:49:42 +0200 Subject: [PATCH] mbuf: fix Doxygen comment of distributor metadata [ upstream commit b3a160230bc0750cc522f456d11aced01d2e9b20 ] /**< is for post annotations. Fixes: 839b20be0e9b ("ethdev: support metadata as flow rule criteria") Signed-off-by: David Marchand Acked-by: Bruce Richardson --- lib/mbuf/rte_mbuf_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h index 3d6ddd6773..9ac9ea2af3 100644 --- a/lib/mbuf/rte_mbuf_core.h +++ b/lib/mbuf/rte_mbuf_core.h @@ -687,6 +687,6 @@ struct rte_mbuf { */ } txadapter; /**< Eventdev ethdev Tx adapter */ - /**< User defined tags. See rte_distributor_process() */ uint32_t usr; + /**< User defined tags. See rte_distributor_process() */ } hash; /**< hash information */ }; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:04.870027290 +0100 +++ 0082-mbuf-fix-Doxygen-comment-of-distributor-metadata.patch 2023-07-20 16:17:54.928751598 +0100 @@ -1 +1 @@ -From b3a160230bc0750cc522f456d11aced01d2e9b20 Mon Sep 17 00:00:00 2001 +From 88497910a913395286bbae92e221b323b256425e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3a160230bc0750cc522f456d11aced01d2e9b20 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index c692c33ec4..2030b3bef9 100644 +index 3d6ddd6773..9ac9ea2af3 100644 @@ -21 +22 @@ -@@ -585,6 +585,6 @@ struct rte_mbuf { +@@ -687,6 +687,6 @@ struct rte_mbuf {