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

Kevin Traynor ktraynor at redhat.com
Thu Nov 5 13:39:12 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/10/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7290fd3d51ba8bcc2324f0ca64198293a6e050fb

Thanks.

Kevin.

---
>From 7290fd3d51ba8bcc2324f0ca64198293a6e050fb 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 fa495b3786..c8f74c1047 100644
--- a/drivers/net/mlx5/mlx5_utils.h
+++ b/drivers/net/mlx5/mlx5_utils.h
@@ -126,8 +126,4 @@ 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)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:54.365837389 +0000
+++ 0005-net-mlx5-remove-unused-log-macros.patch	2020-11-05 12:38:54.147895947 +0000
@@ -1 +1 @@
-From 079f1ae5acf591c52a19f4c5c7e30de5252176e6 Mon Sep 17 00:00:00 2001
+From 7290fd3d51ba8bcc2324f0ca64198293a6e050fb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 079f1ae5acf591c52a19f4c5c7e30de5252176e6 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 97d931fcab..f078bdc65a 100644
+index fa495b3786..c8f74c1047 100644
@@ -22,2 +23,2 @@
-@@ -36,8 +36,4 @@ extern int mlx5_logtype;
- 		PMD_DRV_LOG_CPAREN)
+@@ -126,8 +126,4 @@ extern int mlx5_logtype;
+ #endif /* NDEBUG */



More information about the stable mailing list