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 08D5FA0C4C for ; Mon, 12 Jul 2021 15:13:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 014EC4119D; Mon, 12 Jul 2021 15:13:44 +0200 (CEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id ED2454069E for ; Mon, 12 Jul 2021 15:13:42 +0200 (CEST) Received: by mail-wm1-f45.google.com with SMTP id l17-20020a05600c1d11b029021f84fcaf75so4600793wms.1 for ; Mon, 12 Jul 2021 06:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0f+txYd0Rd/7lkdvbWcmvPh8sggu58zZSycKq1EgRUM=; b=rWsl/tPn7ciLz5qhd9toLjmp99XFPs0/NAv0mX9OjgPoFGo6swpwaLnCP+FULXwNPV kVPOMCwGCo/gfw4FBqu8rgAuSVFiHQ8cqVWmqO/5Q3qNqGvNsFo4QPgFr4ocphywcFbv hfkk2vpQV9Mhw8Me2GOKwC774UTZNX9k0wpzMKqm9HIyRg/QbjCuSKi8c+koRZJeTA9F 41j41CCpHVOgKA4yMfVKyYo99jx8tYcu0+xdxU+cBs6KK0pKrF0wXjUXyMjifxG6irQM kMCYn2YQ9bCxX7bcTvQ6prV5aeoWtMDQQCjk0K8pwksKtPeBN9Zo3PeU3GcG3awl1evc ETjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0f+txYd0Rd/7lkdvbWcmvPh8sggu58zZSycKq1EgRUM=; b=CHtTy3hBK59MQ1gRp7gAcrBvHl47z7cVw6xybW/3sSGClD8XaecgFndyCELeWeW4GU r8tUyib5exZcMHAedH5nj2fBVsWPJ4h+50YFsRLcGps4nw62ATjD97Avbht42RIDTaK2 51VNah3uDRlpZvz1ZEEjuVZGBbMyeyI+y/obcN8awUOpbUB1IAhSPz6uM7ZwHe1cOPjf kMcQ+c7wY7MenMBSV4/63Fx0mh3uAJVUUhZ3E6A06894Y0w82Z90AHQdABapIV/r3XWV aE5rMpP0/tpT7w72DGa8MTDDDoORHe7KT8fKwoxe60rBNtH9AhZbMMXvU4cZBMEHcBh6 Vd0w== X-Gm-Message-State: AOAM533PkamCwOpjvROLpUh13O1aTVM2LABMaad4uQ0k1BEY1/IXWVeg bSli0QmqTDRpe11B3bgYWz0= X-Google-Smtp-Source: ABdhPJwh9JnVX9vXeLQgr2Ba9s37txH3Yw8VBlJQKlmC2rlZYCyaYJWWi4HCSElwJjETwGQIKHVoYw== X-Received: by 2002:a05:600c:2047:: with SMTP id p7mr5881159wmg.93.1626095622758; Mon, 12 Jul 2021 06:13:42 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id r67sm8318545wma.6.2021.07.12.06.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:13:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Jan Viktorin Cc: Ori Kam , Aman Deep Singh , dpdk stable Date: Mon, 12 Jul 2021 14:05:05 +0100 Message-Id: <20210712130551.2462159-70-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix doc of flow action' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 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/14/21. 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/590128bf6ea31873c7dae01d049fdf339dc79e0c Thanks. Luca Boccassi --- >From 590128bf6ea31873c7dae01d049fdf339dc79e0c Mon Sep 17 00:00:00 2001 From: Jan Viktorin Date: Wed, 23 Jun 2021 11:18:25 +0200 Subject: [PATCH] ethdev: fix doc of flow action [ upstream commit 56912ddef2b067a402dc648019938d354237c25a ] The struct rte_flow_action was missing from DPDK API documentation. Fixes: 3850cf0c8c37 ("ethdev: add tunnel encap/decap actions") Signed-off-by: Jan Viktorin Acked-by: Ori Kam Acked-by: Aman Deep Singh --- lib/librte_ethdev/rte_flow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index 3ecf65e3ee..5a45f9fab5 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -2819,7 +2819,7 @@ rte_flow_dynf_metadata_set(struct rte_mbuf *m, uint32_t v) *RTE_FLOW_DYNF_METADATA(m) = v; } -/* +/** * Definition of a single action. * * A list of actions is terminated by a END action. -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:40.310966448 +0100 +++ 0070-ethdev-fix-doc-of-flow-action.patch 2021-07-12 13:41:36.602124944 +0100 @@ -1 +1 @@ -From 56912ddef2b067a402dc648019938d354237c25a Mon Sep 17 00:00:00 2001 +From 590128bf6ea31873c7dae01d049fdf339dc79e0c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 56912ddef2b067a402dc648019938d354237c25a ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/ethdev/rte_flow.h | 2 +- + lib/librte_ethdev/rte_flow.h | 2 +- @@ -18,5 +19,5 @@ -diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h -index 961a5884fe..70f455d47d 100644 ---- a/lib/ethdev/rte_flow.h -+++ b/lib/ethdev/rte_flow.h -@@ -3278,7 +3278,7 @@ rte_flow_dynf_metadata_set(struct rte_mbuf *m, uint32_t v) +diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h +index 3ecf65e3ee..5a45f9fab5 100644 +--- a/lib/librte_ethdev/rte_flow.h ++++ b/lib/librte_ethdev/rte_flow.h +@@ -2819,7 +2819,7 @@ rte_flow_dynf_metadata_set(struct rte_mbuf *m, uint32_t v)