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 AC59042D83 for ; Wed, 28 Jun 2023 16:11:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 830E441144; Wed, 28 Jun 2023 16:11:02 +0200 (CEST) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 4036C400EF for ; Wed, 28 Jun 2023 16:11:00 +0200 (CEST) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-3fa99f6a482so35922455e9.0 for ; Wed, 28 Jun 2023 07:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687961460; x=1690553460; 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=OSx0/EAPZo6+14NFAZj/2v9w4MobtHtuOmzntSTusTc=; b=YWMkUScu8rKJdzuMqNU0L0trYJ5DMAjDOEqXT+TbkxWeNRcfkYPMJDKfZTUFaUL7HA Cg7eyfyh67043YR9eCi9sKkGp48faTrqSQpbSaBzB9ua5d6rofnYSxXkfy6Fqi+eJyTB SvDyIwSmQcW9ZeqkgPelgtt2/YUTrhQZXaMTbECCXEAN7gMZ64YwVsAfgsqDCxp9ZurJ Ip3lm5lULwVtjLe4IkltKbUi5CcWtYAT4ax8FyV8P+1xLTm0vKKcSAavTY2byANbAZcY xAa7fWff2Ee1TOblhVl48Yw3mnLAe+q6FHZZPxLKtO0LCTsmwrJyki7NeeYh8ueNoHkr 0YiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687961460; x=1690553460; 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=OSx0/EAPZo6+14NFAZj/2v9w4MobtHtuOmzntSTusTc=; b=XjbyrVrERFSaXRQSIyvLaGaLo7woDOG6gEcpj2jrrCUYiYfKZFGSvRXsjAjKvyWOhk CQyLebM1vEcc7O/b5B0Ik0B4rkkc4/MvPVE9iGJgJdlLEqCxv8WutmjknaoAuVX4f9sT hWCne/x0K2K+5NxZoqruz52b/1y+vfcfP9CKwSxaSHokDGUvewBhxQx+Bx7q6dyXcJ2B YMuS65hkCeUWlptD5voxKY4tZmtOLrF2V6NGDB5S8VZNvmWNn6+wwm3g0l5zvmrRCUEK aY+WpbUB5pl1T7Pt+FUh7DwJOT9oppUuHqMq2yofDhk4DkoCzAio4SIbAJY2i/fyD3aa FpRw== X-Gm-Message-State: AC+VfDyZDLfqE9BMcT1ARhubwN30hephVzyDxBiZGVslrJWUhP/wlb5e +xmxbOPrlBkwkX/T5llxc+o= X-Google-Smtp-Source: ACHHUZ5kmu3kXEAM5CDIlqfqdkllgnjlZFG/1lNL6VX/p45WjnuHxTf4OnCLRjM3ONn0yJpmT9YYGQ== X-Received: by 2002:a1c:f718:0:b0:3f7:e65b:5252 with SMTP id v24-20020a1cf718000000b003f7e65b5252mr16093203wmh.1.1687961459890; Wed, 28 Jun 2023 07:10:59 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id s24-20020a7bc398000000b003fb9ebb6b88sm5558903wmj.39.2023.06.28.07.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 07:10:59 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Bruce Richardson , dpdk stable Subject: patch 'mbuf: fix Doxygen comment of distributor metadata' has been queued to stable release 20.11.9 Date: Wed, 28 Jun 2023 15:10:27 +0100 Message-Id: <20230628141046.2145871-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628141046.2145871-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-63-luca.boccassi@gmail.com> <20230628141046.2145871-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.9 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/30/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/4a8c06d74f1e8592d04334a3a15f870329cbcc13 Thanks. Luca Boccassi --- >From 4a8c06d74f1e8592d04334a3a15f870329cbcc13 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/librte_mbuf/rte_mbuf_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h index b23764d102..9a0477975d 100644 --- a/lib/librte_mbuf/rte_mbuf_core.h +++ b/lib/librte_mbuf/rte_mbuf_core.h @@ -582,8 +582,8 @@ struct rte_mbuf { * @see rte_event_eth_tx_adapter_txq_set() */ } 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-28 11:40:08.198070528 +0100 +++ 0003-mbuf-fix-Doxygen-comment-of-distributor-metadata.patch 2023-06-28 11:40:08.016026681 +0100 @@ -1 +1 @@ -From b3a160230bc0750cc522f456d11aced01d2e9b20 Mon Sep 17 00:00:00 2001 +From 4a8c06d74f1e8592d04334a3a15f870329cbcc13 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3a160230bc0750cc522f456d11aced01d2e9b20 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - lib/mbuf/rte_mbuf_core.h | 2 +- + lib/librte_mbuf/rte_mbuf_core.h | 2 +- @@ -17,5 +18,5 @@ -diff --git a/lib/mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h -index c692c33ec4..2030b3bef9 100644 ---- a/lib/mbuf/rte_mbuf_core.h -+++ b/lib/mbuf/rte_mbuf_core.h -@@ -584,8 +584,8 @@ struct rte_mbuf { +diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h +index b23764d102..9a0477975d 100644 +--- a/lib/librte_mbuf/rte_mbuf_core.h ++++ b/lib/librte_mbuf/rte_mbuf_core.h +@@ -582,8 +582,8 @@ struct rte_mbuf {