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 D801AA04F3 for ; Thu, 19 Dec 2019 15:37:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CD2ED1BF71; Thu, 19 Dec 2019 15:37:26 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by dpdk.org (Postfix) with ESMTP id D998B1BF84 for ; Thu, 19 Dec 2019 15:37:24 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id a5so5673582wmb.0 for ; Thu, 19 Dec 2019 06:37:24 -0800 (PST) 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=cCVsfgx0Zpke3VnaA1HjBEgqFICwRr6RJg2Xt3PgDSc=; b=LBJr2Hee+w9w1lezWfKqI0CzoUxV/y2EqOVqkmN7jjl2//mCojDrW9n/oFT5I/nUVL 1sFIukiynp5je+WbN0Nr2obDaml9OHq/EF4QPfzsasJR+E9R51eLXLuWSQiXJ173Jkmx EAvfI9copL8LAiIFXd7pmyS017pJ1LChITNBko3bZbGA2CywLBukgkTjTPqHa8RW0foJ eB+fD2XR13KkWGLpCLeaizBjn3d9CpkjgX91Mwe2tld/IaacC8cKd0KtQ/gIjNFOlCzY o6yWbbwGKVCAgEVpHo3zN0waEHLoq6XH7C3DHPabtPo6uvp9Jf2XE/WVMHACJJwOe6TT 1jBQ== 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=cCVsfgx0Zpke3VnaA1HjBEgqFICwRr6RJg2Xt3PgDSc=; b=pXqRVSOBKM3l7ow+x5wR+7fOz9bMQcbzeCpAR5o/LRxWmdbtNk1gTCfUvKGE9Daipu QPVQVntMVyMBtVtJfP6UlC82dXI9JH0yLr/hCYaj9w8MJzerX0lcxhr5nRBAojx/9sgr ptgfYeq/VWv+ekPm04CGwT87dp4r1mQ6siXYWEJSltulm6R8VcuYyOF/vwYk/kmHJ9O5 ULjMXikvDaw3umeDLI9XHYW5yN4eWpqKZIFZAlwT04dsvtITE3wV69P4VeywpO8C4YCA VqNSPHigRqwwivnmu18pQqbg4wGua85+fofmww5pXLGRYh01ieqNg7sIB5Ky1yxHN3Je N3uQ== X-Gm-Message-State: APjAAAUAKnn/q8s+yBJhyXBNwpSb+IYJXBY9dDvhrMizd5NuclWFc+Eh IeFpodxK4rjBoqoPmaAlWKE= X-Google-Smtp-Source: APXvYqy3nPNtP1qoghfHkpm944tboWQk/eS9Y+YplceWwKRUHabKQ0oIWiH1WrHX7lRDtxRZbD2DqA== X-Received: by 2002:a05:600c:1009:: with SMTP id c9mr10848005wmc.162.1576766244586; Thu, 19 Dec 2019 06:37:24 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z83sm6597907wmg.2.2019.12.19.06.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:37:24 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Thu, 19 Dec 2019 14:33:28 +0000 Message-Id: <20191219143447.21506-61-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: remove redundant header file inclusion' has been queued to LTS release 17.11.10 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 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 c33a0f118c662d746455390c2fb822ead70f5082 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 9 Oct 2019 18:41:45 -0700 Subject: [PATCH] net/bnxt: remove redundant header file inclusion [ upstream commit f7b1b6b12da22be3016154c1399d0415fae0f927 ] bnxt.h header includes bnxt_cpr.h and bnxt_util.h. There is no need to include these headers file explicitly. This commit does not cause any functional change. Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_cpr.c | 1 - drivers/net/bnxt/bnxt_ethdev.c | 1 - drivers/net/bnxt/bnxt_hwrm.c | 1 - drivers/net/bnxt/bnxt_irq.c | 1 - drivers/net/bnxt/bnxt_ring.c | 1 - drivers/net/bnxt/bnxt_rxq.c | 1 - drivers/net/bnxt/bnxt_rxr.c | 1 - drivers/net/bnxt/bnxt_txq.c | 1 - drivers/net/bnxt/bnxt_txr.c | 1 - 9 files changed, 9 deletions(-) diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c index ba702df753..a00fdb4d30 100644 --- a/drivers/net/bnxt/bnxt_cpr.c +++ b/drivers/net/bnxt/bnxt_cpr.c @@ -34,7 +34,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_hwrm.h" #include "bnxt_ring.h" #include "hsi_struct_def_dpdk.h" diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 3b74ea4a0d..f1bac2fcaa 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -41,7 +41,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_filter.h" #include "bnxt_hwrm.h" #include "bnxt_irq.h" diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 3b94c5c96b..7d824aeb45 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -41,7 +41,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_filter.h" #include "bnxt_hwrm.h" #include "bnxt_rxq.h" diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c index c332431dba..7d69505fab 100644 --- a/drivers/net/bnxt/bnxt_irq.c +++ b/drivers/net/bnxt/bnxt_irq.c @@ -36,7 +36,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_irq.h" #include "bnxt_ring.h" #include "hsi_struct_def_dpdk.h" diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c index 59d1035fdf..b5527d25a6 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -36,7 +36,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_hwrm.h" #include "bnxt_ring.h" #include "bnxt_rxq.h" diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 5088e9dfdc..cdc5bbfc9f 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -36,7 +36,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_filter.h" #include "bnxt_hwrm.h" #include "bnxt_ring.h" diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 4aaad3563e..95bba9d58f 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -40,7 +40,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_ring.h" #include "bnxt_rxr.h" #include "bnxt_rxq.h" diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c index 99dddddfc5..4ecb037674 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c @@ -36,7 +36,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_ring.h" #include "bnxt_txq.h" #include "bnxt_txr.h" diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index e558413e35..abb705c5d1 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -37,7 +37,6 @@ #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_ring.h" #include "bnxt_txq.h" #include "bnxt_txr.h" -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:28.738396461 +0000 +++ 0061-net-bnxt-remove-redundant-header-file-inclusion.patch 2019-12-19 14:32:26.129298301 +0000 @@ -1,21 +1,20 @@ -From f7b1b6b12da22be3016154c1399d0415fae0f927 Mon Sep 17 00:00:00 2001 +From c33a0f118c662d746455390c2fb822ead70f5082 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 9 Oct 2019 18:41:45 -0700 Subject: [PATCH] net/bnxt: remove redundant header file inclusion +[ upstream commit f7b1b6b12da22be3016154c1399d0415fae0f927 ] + bnxt.h header includes bnxt_cpr.h and bnxt_util.h. There is no need to include these headers file explicitly. This commit does not cause any functional change. -Cc: stable@dpdk.org - Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_cpr.c | 1 - - drivers/net/bnxt/bnxt_ethdev.c | 2 -- - drivers/net/bnxt/bnxt_flow.c | 1 - + drivers/net/bnxt/bnxt_ethdev.c | 1 - drivers/net/bnxt/bnxt_hwrm.c | 1 - drivers/net/bnxt/bnxt_irq.c | 1 - drivers/net/bnxt/bnxt_ring.c | 1 - @@ -23,14 +22,14 @@ drivers/net/bnxt/bnxt_rxr.c | 1 - drivers/net/bnxt/bnxt_txq.c | 1 - drivers/net/bnxt/bnxt_txr.c | 1 - - 10 files changed, 11 deletions(-) + 9 files changed, 9 deletions(-) diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c -index f58372516a..118cf034d2 100644 +index ba702df753..a00fdb4d30 100644 --- a/drivers/net/bnxt/bnxt_cpr.c +++ b/drivers/net/bnxt/bnxt_cpr.c -@@ -8,7 +8,6 @@ - #include +@@ -34,7 +34,6 @@ + #include #include "bnxt.h" -#include "bnxt_cpr.h" @@ -38,42 +37,22 @@ #include "bnxt_ring.h" #include "hsi_struct_def_dpdk.h" diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 4b39586479..84f7b87f31 100644 +index 3b74ea4a0d..f1bac2fcaa 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -14,7 +14,6 @@ - #include +@@ -41,7 +41,6 @@ + #include #include "bnxt.h" -#include "bnxt_cpr.h" #include "bnxt_filter.h" #include "bnxt_hwrm.h" #include "bnxt_irq.h" -@@ -27,7 +26,6 @@ - #include "bnxt_vnic.h" - #include "hsi_struct_def_dpdk.h" - #include "bnxt_nvm_defs.h" --#include "bnxt_util.h" - - #define DRV_MODULE_NAME "bnxt" - static const char bnxt_version[] = -diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c -index bf198f8f23..5aeb001408 100644 ---- a/drivers/net/bnxt/bnxt_flow.c -+++ b/drivers/net/bnxt/bnxt_flow.c -@@ -17,7 +17,6 @@ - #include "bnxt_ring.h" - #include "bnxt_rxq.h" - #include "bnxt_vnic.h" --#include "bnxt_util.h" - #include "hsi_struct_def_dpdk.h" - - static int diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index 0d5362581e..f78beff711 100644 +index 3b94c5c96b..7d824aeb45 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c -@@ -13,7 +13,6 @@ +@@ -41,7 +41,6 @@ #include #include "bnxt.h" @@ -82,10 +61,10 @@ #include "bnxt_hwrm.h" #include "bnxt_rxq.h" diff --git a/drivers/net/bnxt/bnxt_irq.c b/drivers/net/bnxt/bnxt_irq.c -index 729d68d704..6c5bcfb623 100644 +index c332431dba..7d69505fab 100644 --- a/drivers/net/bnxt/bnxt_irq.c +++ b/drivers/net/bnxt/bnxt_irq.c -@@ -9,7 +9,6 @@ +@@ -36,7 +36,6 @@ #include #include "bnxt.h" @@ -94,10 +73,10 @@ #include "bnxt_ring.h" #include "hsi_struct_def_dpdk.h" diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c -index 5bb2cdea91..886029c575 100644 +index 59d1035fdf..b5527d25a6 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c -@@ -9,7 +9,6 @@ +@@ -36,7 +36,6 @@ #include #include "bnxt.h" @@ -106,10 +85,10 @@ #include "bnxt_ring.h" #include "bnxt_rxq.h" diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c -index 9439fcd1fb..a46f96827c 100644 +index 5088e9dfdc..cdc5bbfc9f 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c -@@ -8,7 +8,6 @@ +@@ -36,7 +36,6 @@ #include #include "bnxt.h" @@ -118,10 +97,10 @@ #include "bnxt_hwrm.h" #include "bnxt_ring.h" diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c -index bda4f4c1b9..f0f9b020b1 100644 +index 4aaad3563e..95bba9d58f 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c -@@ -12,7 +12,6 @@ +@@ -40,7 +40,6 @@ #include #include "bnxt.h" @@ -130,10 +109,10 @@ #include "bnxt_rxr.h" #include "bnxt_rxq.h" diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c -index 5ad4ee155e..ebb9199d2d 100644 +index 99dddddfc5..4ecb037674 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c -@@ -8,7 +8,6 @@ +@@ -36,7 +36,6 @@ #include #include "bnxt.h" @@ -142,10 +121,10 @@ #include "bnxt_txq.h" #include "bnxt_txr.h" diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c -index 6e2ee86c05..16021407e8 100644 +index e558413e35..abb705c5d1 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c -@@ -9,7 +9,6 @@ +@@ -37,7 +37,6 @@ #include #include "bnxt.h"