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 F152143829 for ; Tue, 5 Mar 2024 16:35:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EBFC3427E1; Tue, 5 Mar 2024 16:35:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 35A1F42670 for ; Tue, 5 Mar 2024 16:35:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652904; 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; bh=FXjzjtGZbxGhmu+zgvJSdZizW9+4hHRkxdQG3vC1RAI=; b=NDY+59x1GF8p6bX3w9qPLVpeWtOILAJzgD5yWz/AQd4FZxjpnCvrytH7/ewS37KUhnd8P3 7gio7zbO2KEccoCgBHqmYkRQLUijw3S+DWVg3zW7RpYhVoiv+ZpvQLJPfYi7+AoBBIFo4e u1sT8k1T2I3hG1gDPQGEiFKpjB4RiOE= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-258-U6BXAz-RPh-xcQtCMo3tzQ-1; Tue, 05 Mar 2024 10:34:57 -0500 X-MC-Unique: U6BXAz-RPh-xcQtCMo3tzQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 6F7F83C02533; Tue, 5 Mar 2024 15:34:57 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5357F200AFA5; Tue, 5 Mar 2024 15:34:55 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Stephen Hemminger , Tyler Retzlaff , Ruifeng Wang , dpdk stable Subject: patch 'hash: remove some dead code' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:34 +0000 Message-ID: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.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 03/11/24. 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/014409d9f3b67ebff18d7c9b990c46818561920f Thanks. Kevin --- >From 014409d9f3b67ebff18d7c9b990c46818561920f Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 21 Nov 2023 16:24:23 +0100 Subject: [PATCH] hash: remove some dead code [ upstream commit 25e3fe362b3ad7484750eb7134bfca8e3fab5703 ] This macro is not used. Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation") Signed-off-by: David Marchand Reviewed-by: Stephen Hemminger Reviewed-by: Tyler Retzlaff Reviewed-by: Ruifeng Wang --- lib/hash/rte_cuckoo_hash.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h index eb2644f74b..b5a608b442 100644 --- a/lib/hash/rte_cuckoo_hash.h +++ b/lib/hash/rte_cuckoo_hash.h @@ -30,15 +30,4 @@ #endif -#if defined(RTE_LIBRTE_HASH_DEBUG) -#define ERR_IF_TRUE(cond, fmt, args...) do { \ - if (cond) { \ - RTE_LOG(ERR, HASH, fmt, ##args); \ - return; \ - } \ -} while (0) -#else -#define ERR_IF_TRUE(cond, fmt, args...) -#endif - #include #include -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:54.779152597 +0000 +++ 0001-hash-remove-some-dead-code.patch 2024-03-05 14:08:54.588520601 +0000 @@ -1 +1 @@ -From 25e3fe362b3ad7484750eb7134bfca8e3fab5703 Mon Sep 17 00:00:00 2001 +From 014409d9f3b67ebff18d7c9b990c46818561920f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 25e3fe362b3ad7484750eb7134bfca8e3fab5703 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f7afc4dd79..8ea793c66e 100644 +index eb2644f74b..b5a608b442 100644