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 8760BA0093 for ; Tue, 19 May 2020 14:58:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F79D1D5DE; Tue, 19 May 2020 14:58:54 +0200 (CEST) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by dpdk.org (Postfix) with ESMTP id D7D0D1C1E4 for ; Tue, 19 May 2020 14:58:52 +0200 (CEST) Received: by mail-wr1-f53.google.com with SMTP id e1so15811698wrt.5 for ; Tue, 19 May 2020 05:58:52 -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=xJEaalowP0R6XOaHfh2krvW5Zk518XXq8PB2dEtEWT0=; b=P5szHTNj4PK/hVT81rZwbUlGkUDS0XW2iqRyEsLN+Seu+dOC7ZmdXUlVddptxRgVoO vM1OB3cpH25VxuR5FhWbD/R4SPYrwsSLoVk2CkyMuKwSBOw09FLD6ERKVSMuVpc1wLhC 5j5YT/v9ptsi+gOXTWG1Tm4ZQUT29hqLlFD6AxAbOtQoqFTZF1MB6QKMmqJT5R4QGbeq WhH2NfFeC84Scx6nnK1k0Mpgx8bz79WbEF7NNoG9PZ15tnPjgv4WrGGlqo4lT8J82qIa bxUhGkpLXcbMh7iE3r2+b1SAz6yAB9x0mcjtDu9rDdkIPAJN47CsSTG/Vv+9z9ksReV5 1JCA== 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=xJEaalowP0R6XOaHfh2krvW5Zk518XXq8PB2dEtEWT0=; b=rq8DDFcPC3lqoEfqXepLDamq4WGuQUai1DzSwz2Ay7vHxRYqPMFcmc3pW8k0I+jaKR g9OFLfydFMoZERYYmrIH386ps6Iq+LWVkVX7kdmlM0W73srtl5rYqI4JChSICAQxPPM1 eio4aE4l0IsyX8ms1TReaOkRVVtNAM3t6WRy5/2n6liSSj9FH2UepY16/Oas+2h0ULRx JKf/kMFVkR+lBHtOerQQQPk7BHEKz8LyxtkOehnes6NcTtAI4SGO6+ThdytDSFdSfktg fqHZp9vL+T5RZw+M4hB3rLfOuud2gF2Ejn0ZleOVLse/4dMiPLPgulkt+Ep4nzdaMQFu +jpw== X-Gm-Message-State: AOAM533caheabT1s98raJQ8jYI02MHppGlepxQAFopnAhPb3YEgXBUn/ GY13/TITddjPNCoYsPveYTTQbMw7GRc39g== X-Google-Smtp-Source: ABdhPJzDlykLffccl0Q2HnqKTcbvAb9jxTsuDqWy02i0Jzz4YHle0AVGCa93ZejNi/u60J5wi+h/dQ== X-Received: by 2002:adf:f487:: with SMTP id l7mr24558586wro.381.1589893132599; Tue, 19 May 2020 05:58:52 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y207sm4298613wmd.7.2020.05.19.05.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Thomas Monjalon , dpdk stable Date: Tue, 19 May 2020 13:53:24 +0100 Message-Id: <20200519125804.104349-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'pci: remove unneeded includes in public header file' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 027e022a183783ac6d37df4dab9a82f32fc4744b Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 16 Mar 2020 11:29:51 +0000 Subject: [PATCH] pci: remove unneeded includes in public header file [ upstream commit 0dcba52562873f5efa437b61821be7c1bd459a34 ] The rte_pci.h file includes more header files than are actually needed, which means that all users of it also include those headers. This patch removes the unneeded headers - adding them elsewhere where other components were requiring them but not including them directly. Fixes: c752998b5e2e ("pci: introduce library and driver") Signed-off-by: Bruce Richardson Acked-by: Thomas Monjalon --- drivers/bus/ifpga/rte_bus_ifpga.h | 1 + lib/librte_pci/rte_pci.h | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/bus/ifpga/rte_bus_ifpga.h b/drivers/bus/ifpga/rte_bus_ifpga.h index 88a6289642..a6eeaaf568 100644 --- a/drivers/bus/ifpga/rte_bus_ifpga.h +++ b/drivers/bus/ifpga/rte_bus_ifpga.h @@ -17,6 +17,7 @@ extern "C" { #include #include +#include #include /** Name of Intel FPGA Bus */ diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h index c87891405c..c591af010d 100644 --- a/lib/librte_pci/rte_pci.h +++ b/lib/librte_pci/rte_pci.h @@ -16,17 +16,11 @@ extern "C" { #endif -#include #include #include -#include #include -#include #include -#include -#include - /** Formatting string for PCI device identifier: Ex: 0000:00:01.0 */ #define PCI_PRI_FMT "%.4" PRIx16 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8 #define PCI_PRI_STR_SIZE sizeof("XXXXXXXX:XX:XX.X") -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.384063851 +0100 +++ 0014-pci-remove-unneeded-includes-in-public-header-file.patch 2020-05-19 13:56:18.179501099 +0100 @@ -1,23 +1,23 @@ -From 0dcba52562873f5efa437b61821be7c1bd459a34 Mon Sep 17 00:00:00 2001 +From 027e022a183783ac6d37df4dab9a82f32fc4744b Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 16 Mar 2020 11:29:51 +0000 Subject: [PATCH] pci: remove unneeded includes in public header file +[ upstream commit 0dcba52562873f5efa437b61821be7c1bd459a34 ] + The rte_pci.h file includes more header files than are actually needed, which means that all users of it also include those headers. This patch removes the unneeded headers - adding them elsewhere where other components were requiring them but not including them directly. Fixes: c752998b5e2e ("pci: introduce library and driver") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Thomas Monjalon --- drivers/bus/ifpga/rte_bus_ifpga.h | 1 + - drivers/common/mlx5/mlx5_common.h | 1 + lib/librte_pci/rte_pci.h | 6 ------ - 3 files changed, 2 insertions(+), 6 deletions(-) + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/bus/ifpga/rte_bus_ifpga.h b/drivers/bus/ifpga/rte_bus_ifpga.h index 88a6289642..a6eeaaf568 100644 @@ -31,18 +31,6 @@ #include /** Name of Intel FPGA Bus */ -diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h -index 961c606340..16de1b3973 100644 ---- a/drivers/common/mlx5/mlx5_common.h -+++ b/drivers/common/mlx5/mlx5_common.h -@@ -8,6 +8,7 @@ - #include - - #include -+#include - #include - #include - #include diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h index c87891405c..c591af010d 100644 --- a/lib/librte_pci/rte_pci.h