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 064BBA0032 for ; Fri, 18 Feb 2022 13:44:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 00C9741142; Fri, 18 Feb 2022 13:44:41 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 01D4B40395 for ; Fri, 18 Feb 2022 13:44:39 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id i14so14364300wrc.10 for ; Fri, 18 Feb 2022 04:44:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MeSIH1EkNrFQswCt36egUmFjjwzxi+6wPpMZJI3DU2o=; b=RIalAGRiz0jwE/fynMpftwREkxy0ANHrSAmCiQbxm1R2Yr/sjvprYs98hE+Nwdq+gj qunwCUFDJibW1QdF3Zo0VMEVVyxOd2feNc7sjKSUdiKSbHqnDgst1flwsEKF7QKt3DzO 0xRzNpq68uIgv22+PHRV1SP1ZPOxMBc59SOKNui0GRWeBYhd0gGD47Xgax7p+XEraApe jc4MwuQzY9+9uigLRRE5WxuBfPz0Q9mIw4Ijs7bjvc2MXG48vPGx8lLgeL1FspBLz317 1TOZMJZTiHK/uUO30OulBYXXj/ca+UXlaxCt8pxTlZNlVfVLIfqEgAAPbRmg+WeYM6Sy TInw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MeSIH1EkNrFQswCt36egUmFjjwzxi+6wPpMZJI3DU2o=; b=6kZM49dNK4LsH0TdzALY0jsrMu7lULch8aegBehiPdI8LnJdEYw77jCh7o0xKOSb0E Lg1sZ7QX26KqUpMLdfpy7BTXeIVKz+ST8I65zAlueXwDg9F2fc4Q0Zzzcz873Ssf5xGx s/ZYGJGa4r9gfeCY9fRC9pPfS54MPmFN4cURPZOd8hEQUHrIJANByimSBcIB4rU97/mU iSLFGmAZ23jBNVjgd/3Wfpii3XylNhC+pgFBFlW5/ThdSp3CJldI/7VE+lMN2OA7STXQ 8txnPhUbwaomST1uIXbHoFnpusJMJRIohsz5hMLD3KPxPuqfzZQzk4ozX+Pn/TfHa0Ys mVSQ== X-Gm-Message-State: AOAM532SNxyUxUvwzBXD4q8gKrxY4xb1hffb0TX7UcMKEXm03hQ+FpaE HIY1A4WKYKJWCv5qaZtHv+0= X-Google-Smtp-Source: ABdhPJyv68ndeke+tlrQ69UVLSxeo1DLpGVWxIelrhmwAdIbGaKg8+OJI28nPwyTjctpHuHk48EKIg== X-Received: by 2002:a5d:6a0f:0:b0:1e5:53db:4ddd with SMTP id m15-20020a5d6a0f000000b001e553db4dddmr5946067wru.614.1645188278656; Fri, 18 Feb 2022 04:44:38 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id p17sm3881789wme.25.2022.02.18.04.44.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:38 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Jerin Jacob , dpdk stable Subject: patch 'graph: fix C++ include' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:09 +0000 Message-Id: <20220218123931.1749595-100-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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.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 02/20/22. 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/04eb6cecc92a906701788c1ed125d6872f2582be Thanks. Luca Boccassi --- >From 04eb6cecc92a906701788c1ed125d6872f2582be Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Feb 2022 15:42:35 +0000 Subject: [PATCH] graph: fix C++ include [ upstream commit ca6732316c23e158da10b0e3a7b2eaab9d3e1368 ] C++ does not have automatic casting to/from void pointers, so need explicit cast if header is to be included in C++ code Fixes: 40d4f51403ec ("graph: implement fastpath routines") Signed-off-by: Bruce Richardson Acked-by: Jerin Jacob --- lib/librte_graph/rte_graph_worker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_graph/rte_graph_worker.h b/lib/librte_graph/rte_graph_worker.h index eef77f732a..0c0b9c095a 100644 --- a/lib/librte_graph/rte_graph_worker.h +++ b/lib/librte_graph/rte_graph_worker.h @@ -155,7 +155,7 @@ rte_graph_walk(struct rte_graph *graph) * +-----+ <= cir_start + mask */ while (likely(head != graph->tail)) { - node = RTE_PTR_ADD(graph, cir_start[(int32_t)head++]); + node = (struct rte_node *)RTE_PTR_ADD(graph, cir_start[(int32_t)head++]); RTE_ASSERT(node->fence == RTE_GRAPH_FENCE); objs = node->objs; rte_prefetch0(objs); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.674172314 +0000 +++ 0100-graph-fix-C-include.patch 2022-02-18 12:37:37.834795136 +0000 @@ -1 +1 @@ -From ca6732316c23e158da10b0e3a7b2eaab9d3e1368 Mon Sep 17 00:00:00 2001 +From 04eb6cecc92a906701788c1ed125d6872f2582be Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ca6732316c23e158da10b0e3a7b2eaab9d3e1368 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/graph/rte_graph_worker.h | 2 +- + lib/librte_graph/rte_graph_worker.h | 2 +- @@ -18 +19 @@ -diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h +diff --git a/lib/librte_graph/rte_graph_worker.h b/lib/librte_graph/rte_graph_worker.h @@ -20,2 +21,2 @@ ---- a/lib/graph/rte_graph_worker.h -+++ b/lib/graph/rte_graph_worker.h +--- a/lib/librte_graph/rte_graph_worker.h ++++ b/lib/librte_graph/rte_graph_worker.h