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 6D0BE43C60 for ; Thu, 7 Mar 2024 02:32:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E157402F2; Thu, 7 Mar 2024 02:32:27 +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 E1DD840261 for ; Thu, 7 Mar 2024 02:32:25 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-33d153254b7so165652f8f.0 for ; Wed, 06 Mar 2024 17:32:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775145; x=1710379945; darn=dpdk.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=id7J91SQgHa12Wkze7WPWnAnGU2gQRDU0nsoC8igHoA=; b=agWbWkNdZ6CxqWHv0LTnxbEa0NSlfplQVvA/2ypNDDbM+yaHccmnZ2y2fw+ybsyXtr OGn6JXzT8Rv5q1HmI0Ui9M83CSwr+mBcBLi+LN3UVIEwOUMAV7B9PzXtgA8/8+lDKmhC SC48o4qQfrp4/RHUZxonQ3bo2Ln9gXu/T//3xxQvcB+NtV5LxTs936JcTAF7RwmbPnZS pHsZnUuBaC2W1QFPDvcmFReQf8OTBou2DfmQ2KcvYzBcnPEms4zViySgMxr2wMPOZ5xw LmJJTDJwR/kBQo3SHzKmi0ByQ/JsDNx46lVJ0H/NP1GvF2a4Ot3nynDvHOC6sHaxUigE C8Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775145; x=1710379945; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=id7J91SQgHa12Wkze7WPWnAnGU2gQRDU0nsoC8igHoA=; b=oN0FT6U4xYR6njhp8wtuhGWhiAbfhl7Po1ddtFnJNbr7rzahf5RzNrSgMErgLEvrV3 GJ1sXIr3XbotVz0jaUAULN2Y8p9lsfAJT/qSwgrtEyS8JbiuZb9Zw/dPwb8my/6yp7Ct OstoHeG2a5ALomY7q22NmREi5WDqpEmXhHqkwGnQiamfNdW6zcNNilOx7Qy2hOMoxuSh NMS6YuINpcu519tgW1eMAmwhhOxJAGAKtkrHyCegD23GaZgZmus77KxDd5c2HeB6uNKo XOFQMSKOOxdK7rcKwKi00Xn4q+VkAGzdWg+fEG2gs9HcYhWIZv5EYnENKcOBVZ7b9ByP J03Q== X-Forwarded-Encrypted: i=1; AJvYcCWUVpQvIk8cNN6Rih/0y7FnLJqm+OhVcVml670+Z3B1GmscsnrMSum2PiKAW6un03EzjOpG7i7WvhAS2WULZNo= X-Gm-Message-State: AOJu0YzCCFaaq8AUWHlSDvxqIUT2zu05DYFvzWpAoWQsrZvxpzwRxWkF NhIC7vOpHzjudPn1u4lij5iM3ePLbVW/qMR4FV74Sc59w6AQAwPY X-Google-Smtp-Source: AGHT+IH093aVVQ3ZFZtB6HvHXKHzB6gyPauV2MaNFtf5XNH9UsI4pbAWyabaV0RxiVTpSgNFPXqppg== X-Received: by 2002:adf:fc8e:0:b0:33d:eb12:5087 with SMTP id g14-20020adffc8e000000b0033deb125087mr11334931wrr.48.1709775145287; Wed, 06 Mar 2024 17:32:25 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id d14-20020adf9c8e000000b0033e42ab5114sm8247226wre.2.2024.03.06.17.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:32:24 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 7 Mar 2024 01:30:18 +0000 Message-Id: <20240307013159.1735343-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 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 22.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 03/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f66284d141383f8eb0057bfab43f1c4040dc2a7f Thanks. Luca Boccassi --- >From f66284d141383f8eb0057bfab43f1c4040dc2a7f 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 @@ -29,17 +29,6 @@ #define RETURN_IF_TRUE(cond, retval) #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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:35.217417098 +0000 +++ 0001-hash-remove-some-dead-code.patch 2024-03-07 01:05:34.498933650 +0000 @@ -1 +1 @@ -From 25e3fe362b3ad7484750eb7134bfca8e3fab5703 Mon Sep 17 00:00:00 2001 +From f66284d141383f8eb0057bfab43f1c4040dc2a7f 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