From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 24A0BA04DD for ; Wed, 28 Oct 2020 11:46:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 09723CA10; Wed, 28 Oct 2020 11:46:35 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by dpdk.org (Postfix) with ESMTP id A4335CA00 for ; Wed, 28 Oct 2020 11:46:32 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id k21so2990278wmi.1 for ; Wed, 28 Oct 2020 03:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AX8pSeNBR4/kRFFPeBg1OIOiOz/ntrSoFYGlwHiyUT4=; b=GNzMnbX7o1nC2tNbhgRcRpRGT8/RS9TXNIvI9xvDDK2HzZTEpQykPbW5SNwZprEH6o yy8Yh7SpjJniYFl38ILfk9uvQI6QsnHjgMn2NX5bPfu3Mp+27VknAeKs7zd1y6EKC/Qg 5St2lTnI+XqpjGH8owzj2yzaSgR3vB/cq6OfbG7m7hx+Lj4+IEq7jrNi+nnojZOD9DrW YWE6Spzh7x5YiF1i3ybAIzNjlZh+cYI4BwChRDSc068z0RZ30Xuf/0gSUpeJ8kN3GsqL oXOMG9h+5n6hRkR7mr6xOksFs/2yE2AEbw28uzGv8wVNiv6p4DsLiCVZ1Uj7rDzWmaZh Lq0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AX8pSeNBR4/kRFFPeBg1OIOiOz/ntrSoFYGlwHiyUT4=; b=pNZEvDCsnzWIFigBprIumcAh+7j8wyY6b5mlvAtW7JPeDx+pH0c9FR5h7WB9UJmp2Y 0FNnosYt5Y0gTKvyWaxuuamTq/MA04eFhyyDSrJyF6Ig9yZUWsMJus4xxj9FaRwQBlO2 kvdK4uCS3lvZoyIXbdSV9xhpaDxeGGfI4JE+MfJ6gdONce6xlK4/axaOW8qKzEx3VV3g k3MuzHV3/oEv4+udIihRPxD94KotQHPGOJ8ScXpjIe+gEmj91cTORYYmvjMB0fkdivHQ o3v5WMP75MrE6NLDGVR36VS+tljGavi6DLPiDKxoAkz4pMR4ctx/g9wXIedo5vTYRATT JZww== X-Gm-Message-State: AOAM532pnwj1RArRBVqDwatIJUTI41xRumgQkb/mMDwVuetkLTDQNE+U 5FZayFyLJZhiCwDgvaEcslk= X-Google-Smtp-Source: ABdhPJxjkgTJF2WTRlKXhoRzB9mTNSNR0NL4hEXpxbL4PLQ27hnB6gnpO3ThcNjXc9z2mrdy8UCZkQ== X-Received: by 2002:a7b:c085:: with SMTP id r5mr7245744wmh.17.1603881991444; Wed, 28 Oct 2020 03:46:31 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l11sm6066818wro.89.2020.10.28.03.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:46:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Ophir Munk Cc: Matan Azrad , dpdk stable Date: Wed, 28 Oct 2020 10:42:47 +0000 Message-Id: <20201028104606.3504127-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: remove unused log macros' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 10/30/20. 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. Thanks. Luca Boccassi --- >From 29db8c55a6f789b76940f8745fee1ff2a546b19f Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Tue, 25 Aug 2020 09:31:10 +0000 Subject: [PATCH] net/mlx5: remove unused log macros [ upstream commit 079f1ae5acf591c52a19f4c5c7e30de5252176e6 ] Remove utility macros INFO, WARN, ERROR. They are not in use and conflict with identical definitions when compiled under Windows. Fixes: 80f2d0ed7ff9 ("net/mlx5: add hardware flow debug dump") Signed-off-by: Ophir Munk Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_utils.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index fdf1379866..b23eec622d 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -115,10 +115,6 @@ extern int mlx5_logtype; #endif /* NDEBUG */ -#define INFO(...) DRV_LOG(INFO, __VA_ARGS__) -#define WARN(...) DRV_LOG(WARNING, __VA_ARGS__) -#define ERROR(...) DRV_LOG(ERR, __VA_ARGS__) - /* Convenience macros for accessing mbuf fields. */ #define NEXT(m) ((m)->next) #define DATA_LEN(m) ((m)->data_len) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.040635723 +0000 +++ 0008-net-mlx5-remove-unused-log-macros.patch 2020-10-28 10:35:11.400828492 +0000 @@ -1,13 +1,14 @@ -From 079f1ae5acf591c52a19f4c5c7e30de5252176e6 Mon Sep 17 00:00:00 2001 +From 29db8c55a6f789b76940f8745fee1ff2a546b19f Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Tue, 25 Aug 2020 09:31:10 +0000 Subject: [PATCH] net/mlx5: remove unused log macros +[ upstream commit 079f1ae5acf591c52a19f4c5c7e30de5252176e6 ] + Remove utility macros INFO, WARN, ERROR. They are not in use and conflict with identical definitions when compiled under Windows. Fixes: 80f2d0ed7ff9 ("net/mlx5: add hardware flow debug dump") -Cc: stable@dpdk.org Signed-off-by: Ophir Munk Acked-by: Matan Azrad @@ -16,12 +17,12 @@ 1 file changed, 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h -index 97d931fcab..f078bdc65a 100644 +index fdf1379866..b23eec622d 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h -@@ -35,10 +35,6 @@ extern int mlx5_logtype; - __VA_ARGS__ PMD_DRV_LOG_STRIP PMD_DRV_LOG_OPAREN, \ - PMD_DRV_LOG_CPAREN) +@@ -115,10 +115,6 @@ extern int mlx5_logtype; + + #endif /* NDEBUG */ -#define INFO(...) DRV_LOG(INFO, __VA_ARGS__) -#define WARN(...) DRV_LOG(WARNING, __VA_ARGS__)