[dpdk-stable] patch 'net/mlx5: remove unused log macros' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Oct 28 11:42:47 CET 2020


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 <ophirmu at mellanox.com>
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 <ophirmu at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 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 <ophirmu at mellanox.com>
 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 at dpdk.org
 
 Signed-off-by: Ophir Munk <ophirmu at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -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__)


More information about the stable mailing list