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 2D3A64326F for ; Thu, 2 Nov 2023 14:15:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E460427DD; Thu, 2 Nov 2023 14:15:23 +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 3241740A76 for ; Thu, 2 Nov 2023 14:15:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930921; 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=ut85FgvozJoW+8kzSXx1ANrfXwmc2bbea6ymw/is1kE=; b=BbvGSN8KmMemh8G6nKOji3FNG4/Lqu38QZgszTg0DfDpbPMqMt8n/cw/X4QETd3b0t5w93 hsNFkAe8VgFMW76pEnmaID/Roe/kvmFYv7mXcLVBUa73f0Jp7jS00jJly2PKxiUYECJdW+ R4jx6fZ8tBySqu3PAQxBl+dD26sHjUI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517-jU1FrYr3Mv-ZUmVTYrvBjQ-1; Thu, 02 Nov 2023 09:15:18 -0400 X-MC-Unique: jU1FrYr3Mv-ZUmVTYrvBjQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6170E88CDD0; Thu, 2 Nov 2023 13:15:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id A407C492BFC; Thu, 2 Nov 2023 13:15:17 +0000 (UTC) From: Kevin Traynor To: Tyler Retzlaff Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'malloc: remove return from void functions' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:50 +0000 Message-ID: <20231102131254.315947-104-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/23. 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/7a268dfe93b27babb992f5c5e776d105dbe0d945 Thanks. Kevin --- >From 7a268dfe93b27babb992f5c5e776d105dbe0d945 Mon Sep 17 00:00:00 2001 From: Tyler Retzlaff Date: Tue, 17 Oct 2023 06:03:39 -0700 Subject: [PATCH] malloc: remove return from void functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ] Remove return from rte_free and eal_free_no_trace both functions are declared to have a return type of void so they shouldn't return a value. Fixes: 52f409d614a0 ("trace: add memory tracepoints") Signed-off-by: Tyler Retzlaff Reviewed-by: Morten Brørup --- lib/eal/common/rte_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c index d0bec26920..c5a7757deb 100644 --- a/lib/eal/common/rte_malloc.c +++ b/lib/eal/common/rte_malloc.c @@ -47,5 +47,5 @@ void rte_free(void *addr) { - return mem_free(addr, true); + mem_free(addr, true); } @@ -53,5 +53,5 @@ void eal_free_no_trace(void *addr) { - return mem_free(addr, false); + mem_free(addr, false); } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:43.278223314 +0000 +++ 0104-malloc-remove-return-from-void-functions.patch 2023-11-02 13:09:40.926163698 +0000 @@ -1 +1 @@ -From 732ba1be28f75c87aa2616660d34ed0a278c7ae6 Mon Sep 17 00:00:00 2001 +From 7a268dfe93b27babb992f5c5e776d105dbe0d945 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index ebafef3f6c..9db0c399ae 100644 +index d0bec26920..c5a7757deb 100644 @@ -25 +26 @@ -@@ -42,5 +42,5 @@ void +@@ -47,5 +47,5 @@ void @@ -32 +33 @@ -@@ -48,5 +48,5 @@ void +@@ -53,5 +53,5 @@ void