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 EDC7CA0C47 for ; Tue, 10 Aug 2021 17:42:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E739B411C7; Tue, 10 Aug 2021 17:42:12 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 5A728411C5 for ; Tue, 10 Aug 2021 17:42:11 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 3FC693F357 for ; Tue, 10 Aug 2021 15:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610131; bh=ZL12/AeqxKHCIxG6UMVlfE4z7cRID+4P/cTEyRtmcRw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JPPbOq6tBedWgW5zNy+CVf0RAE5hhsZfLf57fPIpaM2E1ogcLTqOYTCVsKJarAHJJ oaUTL3DL/MKwYMNjOipDsNEnf+OvkiMvsQCMeS0mp4uAPRaNz32mnahxCpqVVuS5fB t7utKnczaQPIEutV7yzTa3Z/gn7VBGV1AxJXqZIKR7nRxDiHEFfGK0DFaqX3n3SdcA JFu86sipCgFLnEIXWuGt8fEI88AFqRHCJ9QA9cv3L/sSdpNb4iY+r+d1thvom7vNTF C17Qk5cs67dhuFnBccUXuhoSY8wWTWHPuczLU51MUGs1YMVQz8WCyrwcORlxFJf7Se XrM8KhcQuK24w== Received: by mail-ed1-f70.google.com with SMTP id t23-20020a50ab570000b02903be808b9ca3so342692edc.11 for ; Tue, 10 Aug 2021 08:42:11 -0700 (PDT) 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=ZL12/AeqxKHCIxG6UMVlfE4z7cRID+4P/cTEyRtmcRw=; b=oxB5kAJfDyvRb0uqdDzlmvP72mj3i+MTcfjWe5jWiBvjxk5trAWmGPtizJzxZ5Bokg lVDrUe91NODyMKqtq1wNE3Ez+iUWzM8T/Vkhr/URFC/gjf6KRn/UF1Ioev8SYCeaalgk 5iLw6mrA1tf73Jd/QmnGBoYIfmbDWglpWvmkIc/T9DoVffzqF8U2bEX9xgbqIfBE4iSR kzfKItIoPHDL/kUsCFRp3yJLnPrDeUKt7IZFpl4WGZivd046+cViIwPtIrH2/8MruNfk KdSc6BNujenZCJtL9edB08YU/uo8Dg9oBj0NOWi+7pTq4p+2QEZKXqfFRrGgNarQ0p9J pdsw== X-Gm-Message-State: AOAM531TSXIzzh3Svpni5gTCRJqzrfq5yCImM+f1g8ZbyHwX4iViXpwT b9KA7ZY/DbBRA+ZpiGocPy91Jkq7YmG6Q9nUtA7+5o5QkbwWx7UQAE5YX15brpoG5zEGNUyLRh4 5JOTDCHcRYEgQX303I1M6/7CT X-Received: by 2002:a17:906:c013:: with SMTP id e19mr28759987ejz.389.1628610130979; Tue, 10 Aug 2021 08:42:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJywhtz38xwoQIoPsTOm7Zzr2BxsHpOwxQz4UdYicUU9wx6hFCWYPpfttyTNiqVBZWG4qC/w== X-Received: by 2002:a17:906:c013:: with SMTP id e19mr28759973ejz.389.1628610130781; Tue, 10 Aug 2021 08:42:10 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id q8sm9596911edv.95.2021.08.10.08.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:42:10 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Jan Viktorin Cc: Ori Kam , Aman Deep Singh , dpdk stable Date: Tue, 10 Aug 2021 17:39:14 +0200 Message-Id: <20210810154022.749358-34-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.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 19.11.10 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 19.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 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/cb835fac3fb4b300166daeba74941d60765e4a4d Thanks. Christian Ehrhardt --- >From cb835fac3fb4b300166daeba74941d60765e4a4d 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 c32cd40434..12f69b6365 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -2558,7 +2558,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:14.379727658 +0200 +++ 0034-ethdev-fix-doc-of-flow-action.patch 2021-08-10 15:11:12.970637754 +0200 @@ -1 +1 @@ -From 56912ddef2b067a402dc648019938d354237c25a Mon Sep 17 00:00:00 2001 +From cb835fac3fb4b300166daeba74941d60765e4a4d 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 c32cd40434..12f69b6365 100644 +--- a/lib/librte_ethdev/rte_flow.h ++++ b/lib/librte_ethdev/rte_flow.h +@@ -2558,7 +2558,7 @@ rte_flow_dynf_metadata_set(struct rte_mbuf *m, uint32_t v)