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 81A3FA04B1 for ; Thu, 5 Nov 2020 13:40:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 786B5C800; Thu, 5 Nov 2020 13:40:46 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 68608C7FA for ; Thu, 5 Nov 2020 13:40:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580044; 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: in-reply-to:in-reply-to:references:references; bh=FH9M7ECGCG9Qb63p48VuHByTShlYQAtA4u2+tqWupxU=; b=T/ATUC8xS5qbC4Q2sABB58JDH531AQCU/XaBtIgQcSNuXK4YUgOKaqHLJEKyiesYMoS7rm hpW+4uKhAwRqXsFZTI1t+sbzvlHHUFb3yWxSQh8MlMr8DVeDQ/vf5F1RKBbEOTZx7BhtuK 20jillfa2qdtHb1vyCqg7ZANeOsKT5U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-222-kPODmuRhNtS1IH5R88PIrg-1; Thu, 05 Nov 2020 07:40:40 -0500 X-MC-Unique: kPODmuRhNtS1IH5R88PIrg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3FE5E1074646; Thu, 5 Nov 2020 12:40:39 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0348D5C5FD; Thu, 5 Nov 2020 12:40:37 +0000 (UTC) From: Kevin Traynor To: Ophir Munk Cc: Matan Azrad , dpdk stable Date: Thu, 5 Nov 2020 12:39:12 +0000 Message-Id: <20201105124015.306404-5-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/mlx5: remove unused log macros' has been queued to LTS release 18.11.11 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 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 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 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@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 */