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 745AAA0350 for ; Mon, 21 Feb 2022 16:41:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6AF714068C; Mon, 21 Feb 2022 16:41:47 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1D4ED4013F for ; Mon, 21 Feb 2022 16:41:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5hJz+yCgx1Fy2xuH4n7+JovxdNf1R73cndQdYg3XDNo=; b=agN9zpiBZCbhKtqPOL3+jpFlly8KnuFXDv5ox+ficf/1B4Z9H9MT6OBXowV1g5JeINR9uG DV3FHqW01Oia0kKlc2qcYltOW9wjmhVyfnsIpe2kLzJCvafYZzqrpyCypAkx6zfHwnid/H 4qhkcfwQTbRoEqr8y9ec+Vj2VBeQ5kI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-133-KRy00guCMD6KeCtoIULU3Q-1; Mon, 21 Feb 2022 10:41:42 -0500 X-MC-Unique: KRy00guCMD6KeCtoIULU3Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 45C68100C663; Mon, 21 Feb 2022 15:41:41 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D8067E2E8; Mon, 21 Feb 2022 15:41:40 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Jerin Jacob , dpdk stable Subject: patch 'graph: fix C++ include' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:39 +0000 Message-Id: <20220221153625.152324-150-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/4f328f8e2b3ab46b0d7111e412ca067e78f84829 Thanks. Kevin --- >From 4f328f8e2b3ab46b0d7111e412ca067e78f84829 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/graph/rte_graph_worker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker.h index eef77f732a..0c0b9c095a 100644 --- a/lib/graph/rte_graph_worker.h +++ b/lib/graph/rte_graph_worker.h @@ -156,5 +156,5 @@ rte_graph_walk(struct rte_graph *graph) */ 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; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.829044963 +0000 +++ 0150-graph-fix-C-include.patch 2022-02-21 15:22:44.302704601 +0000 @@ -1 +1 @@ -From ca6732316c23e158da10b0e3a7b2eaab9d3e1368 Mon Sep 17 00:00:00 2001 +From 4f328f8e2b3ab46b0d7111e412ca067e78f84829 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ca6732316c23e158da10b0e3a7b2eaab9d3e1368 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org