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 BD8D9A0524 for ; Thu, 4 Feb 2021 12:36:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5A5424077B; Thu, 4 Feb 2021 12:36:39 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 62D40240734 for ; Thu, 4 Feb 2021 12:36:38 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cw7-0005VH-VC; Thu, 04 Feb 2021 11:36:36 +0000 From: Christian Ehrhardt To: Bruce Richardson Cc: Andrew Rybchenko , David Marchand , dpdk stable Date: Thu, 4 Feb 2021 12:28:52 +0100 Message-Id: <20210204112954.2488123-77-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix missing header include' has been queued to stable release 19.11.7 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/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/bde221c8074df1b5da2391f0b3f530def5fe9191 Thanks. Christian Ehrhardt --- >From bde221c8074df1b5da2391f0b3f530def5fe9191 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 Jan 2021 11:10:35 +0000 Subject: [PATCH] ethdev: fix missing header include [ upstream commit ebbd4d33d78555f083033d7bbf5668eecb285b94 ] The define for RTE_ETH_FLOW_MAX is defined in rte_ethdev.h, so that header should be included in rte_eth_ctrl.h to allow it to be compiled independently. Fixes: 7fa96d696f2c ("ethdev: unification of flow types") Signed-off-by: Bruce Richardson Acked-by: Andrew Rybchenko Reviewed-by: David Marchand --- lib/librte_ethdev/rte_eth_ctrl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/librte_ethdev/rte_eth_ctrl.h index 1416c371fb..906cd4f458 100644 --- a/lib/librte_ethdev/rte_eth_ctrl.h +++ b/lib/librte_ethdev/rte_eth_ctrl.h @@ -9,6 +9,7 @@ #include #include #include "rte_flow.h" +#include "rte_ethdev.h" /** * @deprecated Please use rte_flow API instead of this legacy one. -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:31.268821218 +0100 +++ 0077-ethdev-fix-missing-header-include.patch 2021-02-04 12:04:28.074789772 +0100 @@ -1 +1 @@ -From ebbd4d33d78555f083033d7bbf5668eecb285b94 Mon Sep 17 00:00:00 2001 +From bde221c8074df1b5da2391f0b3f530def5fe9191 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ebbd4d33d78555f083033d7bbf5668eecb285b94 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 1cca522fa3..8a50dbfef9 100644 +index 1416c371fb..906cd4f458 100644